/ - Diff - Application: gvSIG desktop - gvSIG

     <?xml version="1.0" encoding="UTF-8"?>
     <projectDescription>
     	<name>extPublishMapserver</name>
     	<comment></comment>
     	<projects>
     	</projects>
     	<buildSpec>
     		<buildCommand>
     			<name>org.eclipse.jdt.core.javabuilder</name>
     			<arguments>
     			</arguments>
     		</buildCommand>
     	</buildSpec>
     	<natures>
     		<nature>org.eclipse.jdt.core.javanature</nature>
     	</natures>
     </projectDescription>

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.mapserver.model;
     import junit.framework.Test;
     import junit.framework.TestSuite;
     import org.gvsig.publish.mapserver.model.wcs.MapserverWCSLayerTest;
     import org.gvsig.publish.mapserver.model.wcs.MapserverWCSTest;
     import org.gvsig.publish.mapserver.model.wfs.MapserverWFSLayerTest;
     import org.gvsig.publish.mapserver.model.wfs.MapserverWFSTest;
     import org.gvsig.publish.mapserver.model.wms.MapserverWMSLayerTest;
     import org.gvsig.publish.mapserver.model.wms.MapserverWMSTest;
     public class AllModelTests {
     	public static Test suite() {
     		TestSuite suite = new TestSuite(
     				"Test for org.gvsig.publish.mapserver.model");
     		//$JUnit-BEGIN$
     		suite.addTestSuite(MapserverTest.class);
     		suite.addTestSuite(MapserverWMSTest.class);
     		suite.addTestSuite(MapserverWMSLayerTest.class);
     		suite.addTestSuite(MapserverWFSTest.class);
     		suite.addTestSuite(MapserverWFSLayerTest.class);
     		suite.addTestSuite(MapserverWCSTest.class);
     		suite.addTestSuite(MapserverWCSLayerTest.class);
     		//$JUnit-END$
     		return suite;
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.mapserver.model.wcs;
     import org.gvsig.publish.exceptions.InvalidRemoteResourceException;
     import org.gvsig.publish.mapserver.model.Mapserver;
     import org.gvsig.publish.serversmodel.RemoteResourceTest;
     public class MapserverWCSLayerTest extends RemoteResourceTest {
     	public MapserverWCSLayerTest() throws InvalidRemoteResourceException {
     		super();
     		// TODO Auto-generated constructor stub
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getRemoteResourceClass()
     	 */
     	public Class getRemoteResourceClass() {
     		// TODO Auto-generated method stub
     		return MapserverWCSLayer.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getRemoteResourceRegisterTag()
     	 */
     	public String getRemoteResourceRegisterTag() {
     		// TODO Auto-generated method stub
     		return MapserverWCSLayer.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getServerClass()
     	 */
     	public Class getServerClass() {
     		// TODO Auto-generated method stub
     		return Mapserver.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getServerRegisterTag()
     	 */
     	public String getServerRegisterTag() {
     		// TODO Auto-generated method stub
     		return Mapserver.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getServiceClass()
     	 */
     	public Class getServiceClass() {
     		// TODO Auto-generated method stub
     		return MapserverWCS.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getServiceRegisterTag()
     	 */
     	public String getServiceRegisterTag() {
     		// TODO Auto-generated method stub
     		return MapserverWCS.REGISTER_TAG;
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.mapserver.model.wcs;
     import org.gvsig.publish.mapserver.model.Mapserver;
     import org.gvsig.publish.serversmodel.ServiceTest;
     public class MapserverWCSTest extends ServiceTest {
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getRemoteResourceClass()
     	 */
     	public Class getRemoteResourceClass() {
     		return MapserverWCSLayer.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getRemoteResourceRegisterTag()
     	 */
     	public String getRemoteResourceRegisterTag() {
     		return MapserverWCS.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServerClass()
     	 */
     	public Class getServerClass() {
     		return Mapserver.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServerRegisterTag()
     	 */
     	public String getServerRegisterTag() {
     		return Mapserver.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServiceClass()
     	 */
     	public Class getServiceClass() {
     		return MapserverWCS.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServiceRegisterTag()
     	 */
     	public String getServiceRegisterTag() {
     		return MapserverWCS.REGISTER_TAG;
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.mapserver.model.wfs;
     import org.gvsig.publish.exceptions.InvalidRemoteResourceException;
     import org.gvsig.publish.mapserver.model.Mapserver;
     import org.gvsig.publish.serversmodel.RemoteResourceTest;
     public class MapserverWFSLayerTest extends RemoteResourceTest {
     	public MapserverWFSLayerTest() throws InvalidRemoteResourceException {
     		super();
     		// TODO Auto-generated constructor stub
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getRemoteResourceClass()
     	 */
     	public Class getRemoteResourceClass() {
     		return MapserverWFSLayer.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getRemoteResourceRegisterTag()
     	 */
     	public String getRemoteResourceRegisterTag() {
     		return MapserverWFSLayer.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServerClass()
     	 */
     	public Class getServerClass() {
     		return Mapserver.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServerRegisterTag()
     	 */
     	public String getServerRegisterTag() {
     		return Mapserver.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServiceClass()
     	 */
     	public Class getServiceClass() {
     		return MapserverWFS.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServiceRegisterTag()
     	 */
     	public String getServiceRegisterTag() {
     		return MapserverWFS.REGISTER_TAG;
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.mapserver.model.wfs;
     import org.gvsig.publish.mapserver.model.Mapserver;
     import org.gvsig.publish.serversmodel.ServiceTest;
     public class MapserverWFSTest extends ServiceTest {
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getRemoteResourceClass()
     	 */
     	public Class getRemoteResourceClass() {
     		return MapserverWFSLayer.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getRemoteResourceRegisterTag()
     	 */
     	public String getRemoteResourceRegisterTag() {
     		return MapserverWFSLayer.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServerClass()
     	 */
     	public Class getServerClass() {
     		return Mapserver.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServerRegisterTag()
     	 */
     	public String getServerRegisterTag() {
     		return Mapserver.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServiceClass()
     	 */
     	public Class getServiceClass() {
     		return MapserverWFS.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServiceRegisterTag()
     	 */
     	public String getServiceRegisterTag() {
     		return MapserverWFS.REGISTER_TAG;
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.mapserver.model;
     import java.io.File;
     import java.net.URL;
     import org.gvsig.publish.infoproject.IProjectInfo;
     import org.gvsig.publish.infoproject.factory.ProjectInfoFactory;
     import org.gvsig.publish.mapserver.model.wms.MapserverWMS;
     import org.gvsig.publish.serversmodel.ServerTest;
     import org.gvsig.publish.util.LocalResourcesTestUtilities;
     public class MapserverTest extends ServerTest {
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServerTest#getServerClass()
     	 */
     	public Class getServerClass() {
     		return Mapserver.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServerTest#getServerRegisterTag()
     	 */
     	public String getServerRegisterTag() {
     		return Mapserver.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServerTest#getServiceClass()
     	 */
     	public Class getServiceClass() {
     		return MapserverWMS.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServerTest#getServiceRegisterTag()
     	 */
     	public String getServiceRegisterTag() {
     		return MapserverWMS.REGISTER_TAG;
+    	}
     	/* (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServerTest#testPublish()
     	 */
     	public void testPublish() throws Exception {
     		server.setServerURL( new URL("http://localhost/cgi-bin/mapserv"));
     		LocalResourcesTestUtilities util = new LocalResourcesTestUtilities();
     		IProjectInfo proj = ProjectInfoFactory.getProjectInfo(util.getProject_complete());
     		server.addInfo(proj.getViewsInfo()[0]);
     		server.addService(service);
     		((Mapserver)server).setMapfileFile(new File("test.map"));
     		super.testPublish();
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.mapserver.model.wms;
     import java.net.MalformedURLException;
     import java.net.URL;
     import org.gvsig.publish.exceptions.InvalidRemoteResourceException;
     import org.gvsig.publish.mapserver.model.Mapserver;
     import org.gvsig.publish.serversmodel.RemoteResourceTest;
     public class MapserverWMSLayerTest extends RemoteResourceTest {
     	public MapserverWMSLayerTest() throws InvalidRemoteResourceException {
     		super();
     		// TODO Auto-generated constructor stub
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getRemoteResourceClass()
     	 */
     	public Class getRemoteResourceClass() {
     		// TODO Auto-generated method stub
     		return MapserverWMSLayer.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getRemoteResourceRegisterTag()
     	 */
     	public String getRemoteResourceRegisterTag() {
     		// TODO Auto-generated method stub
     		return MapserverWMSLayer.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getServerClass()
     	 */
     	public Class getServerClass() {
     		// TODO Auto-generated method stub
     		return Mapserver.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getServerRegisterTag()
     	 */
     	public String getServerRegisterTag() {
     		// TODO Auto-generated method stub
     		return Mapserver.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getServiceClass()
     	 */
     	public Class getServiceClass() {
     		// TODO Auto-generated method stub
     		return MapserverWMS.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#getServiceRegisterTag()
     	 */
     	public String getServiceRegisterTag() {
     		// TODO Auto-generated method stub
     		return MapserverWMS.REGISTER_TAG;
+    	}
     	/* (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.RemoteResourceTest#testGetXMLEntity()
     	 */
     	public void testGetXMLEntity() {
     		// TODO Auto-generated method stub
     		super.testGetXMLEntity();
     		try {
     			server.setServerURL(new URL ("http://servidor/servicio"));
     			System.out.println(server.getXMLEntity().toString());
     		} catch (MalformedURLException e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
+    		}
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.mapserver.model.wms;
     import org.gvsig.publish.mapserver.model.Mapserver;
     import org.gvsig.publish.serversmodel.ServiceTest;
     public class MapserverWMSTest extends ServiceTest {
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getRemoteResourceClass()
     	 */
     	public Class getRemoteResourceClass() {
     		return MapserverWMSLayer.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getRemoteResourceRegisterTag()
     	 */
     	public String getRemoteResourceRegisterTag() {
     		return MapserverWMSLayer.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServerClass()
     	 */
     	public Class getServerClass() {
     		return Mapserver.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServerRegisterTag()
     	 */
     	public String getServerRegisterTag() {
     		return Mapserver.REGISTER_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServiceClass()
     	 */
     	public Class getServiceClass() {
     		return MapserverWMS.class;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.serversmodel.ServiceTest#getServiceRegisterTag()
     	 */
     	public String getServiceRegisterTag() {
     		return MapserverWMS.REGISTER_TAG;
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.mapserver.gui;
     import java.net.MalformedURLException;
     import java.net.URL;
     import javax.swing.JFrame;
     import org.gvsig.publish.PublishRegister;
     import org.gvsig.publish.exceptions.InvalidRemoteResourceException;
     import org.gvsig.publish.gui.publish.PublishController;
     import org.gvsig.publish.mapserver.gui.browser.MSBrowserController;
     import org.gvsig.publish.mapserver.model.Mapserver;
     import org.gvsig.publish.mapserver.model.wms.MapserverWMS;
     import org.gvsig.publish.mapserver.model.wms.MapserverWMSLayer;
     import org.gvsig.publish.serversmodel.Publication;
     import org.gvsig.publish.serversmodel.RemoteResource;
     import org.gvsig.publish.serversmodel.Server;
     import org.gvsig.publish.serversmodel.Service;
     /**
      * Tests the Mapserver GUI
+     *
      * @author jvhigon
+     *
      */
     public class Test_MapserverGUI{
     	static public PublishController ctrl = null;
     	static public Publication publication=null;
     	static public Server server=null;
     	static public Service service=null;
     	static public RemoteResource rr=null;
     	public static void main(String[] args) {
     	    //Schedule a job for the event-dispatching thread:
             //creating and showing this application's GUI.
             javax.swing.SwingUtilities.invokeLater(new Runnable() {
             		public void run() {
     				    try {
     						createModel();
     					} catch (InvalidRemoteResourceException e) {
     						// TODO Auto-generated catch block
     						e.printStackTrace();
+    					}
     				    createController();
     				    registerController();
     				    showGUI();
+    				}
           });
+        }
         private static void createModel() throws InvalidRemoteResourceException{
         	publication = new Publication();
         	server = new Mapserver();
         	try {
     			server.setServerURL(new URL("http://localhost/cgi-bin/mapserv"));
     		} catch (MalformedURLException e) {
     			e.printStackTrace();
+    		}
     		publication.setServer(server);
     		service = new MapserverWMS((Mapserver)server);
     		server.addService(service);
     		rr = new MapserverWMSLayer((MapserverWMS)service);
     		service.addRemoteResource(rr);
+    	}
         private static  void createController(){
         	ctrl = new PublishController();
         	ctrl.setPublication(publication);
+        }
         private static void registerController(){
             //register controller
         	PublishRegister.register().addController(Mapserver.REGISTER_TAG, MSBrowserController.class);
+        }
     	private static void showGUI(){
             //Create and set up the window.
             JFrame frame = new JFrame("Testing Mapserver GUI");
             frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
             //Add the publish panel
             frame.getContentPane().add(ctrl.getWindow());
             //Display the window.
             frame.pack();
             frame.setVisible(true);
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.mapserver.util;
     import java.io.File;
     import junit.framework.TestCase;
     public class MapserverUtilitiesTest extends TestCase {
     	public void testGetDataPath() {
     		String shapepath = "/data";
     		File localPoint = new File("/mnt/simon");
     		String path1 = "/mnt/simon/mydata/test.shp";
     		String path2 = "/home/test.shp";
     //		DataSourceInfoFactory.getInstance(layer);
     //		String aux = MapserverUtilities.getDataParameter(ds, shapepath, localMountPoint)(path1, shapepath, localPoint);
     		System.out.println("Local point:" + localPoint);
     		System.out.println("Shapepath: " + shapepath);
     		System.out.println("DATA: " + path1);
     		//System.out.println("DATA: " + aux);
+    	}
+    }

     #mapserver basic
     publishms_mapserver_url=URL
     publishms_mapserver_mapfile=Fichero de configuraci?n
     #mapserver advanced
     publishms_mapserver_imagepath=Directorio temporal
     publishms_mapserver_shapepath=Directorio datos
     publishms_debug=Depuraci?n
     #preferences page
     publishms_publish_view=GUI de publicaci?n
     publishms_change_view_properties=Debe reiniciar la aplicaci?n para que los cambios sean efectivos
     publishms_restart=Reinicie la aplicaci?n
     publishms_publish_mapserver=Publicaci?n en Mapserver
     #mapserver layer
     publishms_mapserver_layer_properties=Propiedades capa Mapserver
     publishms_mosaic=Mosaico de im?genes
     #Model Mapserver
     publishms_nothing_to_publish=Nada que publicar. A?ada recursos a la publicaci?n.
     publishms_the_mapfile_is_not_defined=Seleccione un fichero para escribir la configuraci?n.
     publishms_publish_message=Publicaci?n generada correctamente.\nAseg?rese que las fuentes de datos son accesibles por parte del usuario que ejecuta el CGI de Mapserver.\nCualquier contrase?a aparecer? en los ficheros generados sin encriptar.
     publishms_no_services_defined=No se ha definido ning?n servicio.
     publihsms_permission_denied=Imposible generar los ficheros de configuraci?n. Permiso denegado.
     #publishms_mapserver_properties=Propiedades Servidor Mapserver
     #publishms_mapserver_mapname=Nombre del mapa
     #publishms_name=Nombre

     publishms_nothing_to_publish=Nothing to publish. Add a new resource.
     publishms_the_mapfile_is_not_defined=Select a file to write the configuration.
     publishms_debug=Debug
     publishms_mapserver_properties=Mapserver properties
     publishms_mapserver_mapname=Map name
     publishms_mapserver_url=URL
     publishms_mapserver_mapfile=Configuration file
     publishms_name=Name
     publishms_mapserver_imagepath=Temp directory
     publishms_mapserver_shapepath=ShapePath
     publishms_change_view_message=Restart the application in order to apply changes
     publishms_restart=Restart application
     publishms_publish_view=Publication GUI
     publishms_publish_mapserver=Mapserver publication
     #mapserver layer properties
     publishms_mapserver_layer_properties=Mapserver layer properties
     publishms_mosaic=Image Mosaic
     #publish message
     publishms_publish_message=Publication generated successfully.\nData sources must be accessible by the user who executes the Mapserver CGI.\nFurthermore, any password can be read in the mapfile !!
     publihsms_permission_denied=Cannot generate the configuration files. Permission denied.

     <?xml version="1.0" encoding="ISO-8859-1"?>
     <plugin-config>
     	<depends plugin-name="com.iver.cit.gvsig" />
     	<depends plugin-name="org.gvsig.publish" />
     	<libraries library-dir="."/>
     	<resourceBundle name="text"/>
     	<extensions>
     		<extension class-name="org.gvsig.publish.mapserver.MapserverExtension"
     			description="MapserverPublish Extension"
     			active="true"
     			priority="1">
     		</extension>
     	</extensions>
     </plugin-config>

     #mapserver_text_de.properties
     publishms_change_view_message=Anwendung neustarten, damit die \u00C4nderungen wirksam werden
     publishms_change_view_properties=Anwendung neustarten, damit die \u00C4nderungen wirksam werden
     publishms_debug=Fehler beseitigen
     publishms_mapserver_imagepath=Tempor\u00E4res Verzeichnis
     publishms_mapserver_layer_properties=Mapserver Layer Eigenschaften
     publishms_mapserver_mapfile=Konfigurationsdatei
     publishms_mapserver_mapname=Name der Karte
     publishms_mapserver_properties=Mapserver Eigenschaften
     publishms_publish_message=Publikation erfolgreich abgeschlossen.\nDie Originaldateien m\u00FCssen dem Anwender, der die Mapserver CGI aufruft, frei zug\u00E4nglich sein.\nAchtung\: Jedes Passwort kann in den erzeugten Dateien lesbar sein\!\!
     publishms_mapserver_shapepath=Shape- Pfad
     publishms_mapserver_url=URL
     publishms_mosaic=Imagekatalog
     publishms_name=Name
     publishms_nothing_to_publish=Nichts zum publizieren. F\u00FCgen sie die entsprechenden Dateien hinzu.
     publishms_publish_mapserver=Mapserver Publikation
     publishms_publish_view=GUI Publikation
     publishms_restart=neu starten
     publishms_the_mapfile_is_not_defined=Datei ausw\u00E4hlen wohin die Konfigurationsdatei generiert werden soll.

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.mapserver.util;
     import org.gvsig.publish.infoproject.IDataSourceInfo;
     import org.gvsig.publish.infoproject.datasources.IDataBaseInfo;
     import org.gvsig.publish.infoproject.datasources.IFileInfo;
     import org.gvsig.publish.infoproject.datasources.IRasterDSInfo;
     /**
      * Utilities for publishing in Mapserver
      * @author jvhigon
+     *
      */
     public class MapserverUtilities {
     	/**
+    	 *
     	 * @param datasource
     	 * @return outputformat name in format "extensionfile_datatype". It returns null If imagemode is null
     	 */
     	public static String getOutputformatName(IRasterDSInfo datasource){
     		IFileInfo file = (IFileInfo)datasource;
     		//String aux = file.getExtension().toUpperCase() + "_" + datasource.getDataType();
     		String aux = null;
     		if (getOutputformatImageMode(datasource) !=null)
     			aux = file.getExtension().toUpperCase() + "_" + getOutputformatImageMode(datasource);
     		return aux;
+    	}
     	/**
+    	 *
     	 * @param datasource
     	 * @return Gets a valid DRIVER value for Mapserver outputformat (GDAL/Gtiff, GDAL/ECW, GDAL/HFA)
     	 * <p>
     	 * It can be null if the driver is not Gtiff, ECW or HFA
     	 * TODO: add other drivers
     	 */
     	public static String getOutputformatDriver(IDataSourceInfo ds){
     		IFileInfo file = (IFileInfo)ds;
     		String extension = file.getExtension().toLowerCase();
     		if (extension.equals("tif")||extension.equals("tiff")){
     			return "GDAL/Gtiff";
+    		}
     		if (extension.equals("ecw")){
     			return "GDAL/ECW";
+    		}
     		if (extension.equals("img")){
     			return "GDAL/HFA";
+    		}
     		if (extension.equals("jpg") || extension.equals("jpeg")){
     			return "GD/JPEG";
+    		}
     		return null;
+    	}
     	/**
+    	 *
     	 * @param datasource
     	 * @return Gets a valid MIMETYPE value for Mapserver outputformats
     	 */
     	public static String getOutputformatMimetype(IDataSourceInfo datasource){
     		IFileInfo file = (IFileInfo)datasource;
     		String aux = file.getExtension().toLowerCase();
     		aux ="image/" + aux;
     		return  aux;
+    	}
     	/**
     	 * @see http://mapserver.org/mapfile/outputformat.html
     	 * @param datasource
     	 * @return Gets a valid IMAGEMODE value for Mapserver outputformats. The values can be PC256/RGB/RGBA/INT16/FLOAT32
     	 * <p>
     	 * It can be null if the datatype is not supported by mapserver.
     	 * We query the first band of the datasource
     	 * TODO: Review the mapping between raster data type - Mapserver data type
     	 */
     	public static String getOutputformatImageMode(IRasterDSInfo datasource){
     		int aux = datasource.getDataType(0);
     		switch(aux){
     			case IRasterDSInfo.TYPE_BYTE:
     				return "BYTE";
     			case IRasterDSInfo.TYPE_DOUBLE:
     				return "FLOAT64";
     			case IRasterDSInfo.TYPE_FLOAT:
     				return "FLOAT32";
     			case IRasterDSInfo.TYPE_INT:
     				return "INT16";
     			case IRasterDSInfo.TYPE_SHORT:
     				return "RGB";
     			case IRasterDSInfo.TYPE_USHORT:
     				return "PC256";
     			case IRasterDSInfo.TYPE_UNDEFINED:
     				return "RGBA";
+    		}
     		return null;
+    	}
     	/**
+    	 *
     	 * @param datasource
     	 * @return Gets a valid EXTENSION value for Mapserver outputformats.
     	 */
     	public static String getOuputformatExtension(IDataSourceInfo datasource) {
     		IFileInfo file = (IFileInfo)datasource;
     		String aux = file.getExtension().toLowerCase();
     		return aux;
+    	}
     	/**
     	 * Utility for calculating the parameter DATA in the Mapfile. When the data source is a file it calculates
     	 * the absolute path to the file or the relative path if the shapepath is defined. On the other hand, if the datasource is a
     	 * database connection, it calculates the data clause.
+    	 *
+    	 *
     	 * @param ds data source
     	 * @param shapepath
     	 * @param localMountPoint
     	 * @return the data section in the mapfile. It can be null.
+    	 *
     	public static String getDataParameter(IDataSourceInfo ds, String shapepath, File localMountPoint){
     		String res = null;
     		if (ds.getType() == IDataSourceInfo.SHAPE_TYPE || ds.getType() == IDataSourceInfo.RASTER_TYPE){
     			String path = ((IFileInfo)ds).getAbsolutePath();
     			if (shapepath == null){
     				res = path;
     			}else{
     				if (localMountPoint == null){
     					res = ((IFileInfo)ds).getFileName();
     				}else{
     					res = path.substring(localMountPoint.getAbsolutePath().length());
     					if (res.startsWith(File.separator)){
     						res = res.substring(1);
+    					}
+    				}
+    			}
+    		}
     		if (ds.getType() == IDataSourceInfo.POSTGIS_TYPE){
     			IDataBaseInfo db = (IDataBaseInfo)ds;
     			String table = db.getTableName();
     			res = "the_geom from "  + table + " using unique " + db.getGID() + " using srid=" + ds.getSRID();
+    		}
     		return res;
+    	}
     	*/
     	/**
     	 * Utility for calculate the CONNECTIONTYPE parameter in the Mapfile. If the datasource is a shapefile or a raster file it will return null
     	 * @param ds data source
     	 * @return "POSTGIS" or null
     	 */
     	public static String getConnectionTypeParameter(IDataSourceInfo ds){
     		String res = null;
     		if (ds.getType() == IDataSourceInfo.POSTGIS_TYPE){
     			res = "POSTGIS";
+    		}
     		return res;
+    	}
     	/**
     	 * Utility for calculate the CONNECTION parameter in the Mapfile. If the datasource is a shapefile or a raster file it will return null
     	 * @param ds data source
     	 * @return a string which identifies a connection or null
     	 */
     	public static String getConnectionParameter(IDataSourceInfo ds){

Application: gvSIG desktop

Revision 31593