1.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/src/main/java/org/molwind/webservice/Server.java Thu Oct 15 16:39:48 2009 +0200
1.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/src/main/java/org/molwind/webservice/Server.java Thu Oct 15 17:28:16 2009 +0200
1.3 @@ -1,5 +1,20 @@
1.4 package org.molwind.webservice;
1.5 -
1.6 +/*
1.7 + * This file is part of Molwind.
1.8 + *
1.9 + * Molwind is free software: you can redistribute it and/or modify
1.10 + * it under the terms of the GNU General Public License as published by
1.11 + * the Free Software Foundation, either version 3 of the License, or
1.12 + * (at your option) any later version.
1.13 + *
1.14 + * Molwind is distributed in the hope that it will be useful,
1.15 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1.16 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.17 + * GNU General Public License for more details.
1.18 + *
1.19 + * You should have received a copy of the GNU General Public License
1.20 + * along with Molwind. If not, see <http://www.gnu.org/licenses/>.
1.21 + */
1.22
1.23 import java.lang.Thread;
1.24
2.1 Binary file molwind-client/molwind-webservice/molwind-endpoint/target/classes/org/molwind/webservice/Server.class has changed
3.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetWorldNames.java Thu Oct 15 16:39:48 2009 +0200
3.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetWorldNames.java Thu Oct 15 17:28:16 2009 +0200
3.3 @@ -8,7 +8,7 @@
3.4
3.5 /**
3.6 * This class was generated by the CXF 2.0.9
3.7 - * Thu Oct 15 16:35:31 CEST 2009
3.8 + * Thu Oct 15 17:27:16 CEST 2009
3.9 * Generated source version: 2.0.9
3.10 *
3.11 */
4.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetWorldNamesResponse.java Thu Oct 15 16:39:48 2009 +0200
4.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/GetWorldNamesResponse.java Thu Oct 15 17:28:16 2009 +0200
4.3 @@ -9,7 +9,7 @@
4.4
4.5 /**
4.6 * This class was generated by the CXF 2.0.9
4.7 - * Thu Oct 15 16:35:31 CEST 2009
4.8 + * Thu Oct 15 17:27:16 CEST 2009
4.9 * Generated source version: 2.0.9
4.10 *
4.11 */
5.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/IOExceptionBean.java Thu Oct 15 16:39:48 2009 +0200
5.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/IOExceptionBean.java Thu Oct 15 17:28:16 2009 +0200
5.3 @@ -8,7 +8,7 @@
5.4
5.5 /**
5.6 * This class was generated by the CXF 2.0.9
5.7 - * Thu Oct 15 16:35:34 CEST 2009
5.8 + * Thu Oct 15 17:27:19 CEST 2009
5.9 * Generated source version: 2.0.9
5.10 *
5.11 */
6.1 --- a/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/JDOMExceptionBean.java Thu Oct 15 16:39:48 2009 +0200
6.2 +++ b/molwind-client/molwind-webservice/molwind-endpoint/target/generated/wsdl/org/molwind/webservice/jaxws/JDOMExceptionBean.java Thu Oct 15 17:28:16 2009 +0200
6.3 @@ -8,7 +8,7 @@
6.4
6.5 /**
6.6 * This class was generated by the CXF 2.0.9
6.7 - * Thu Oct 15 16:35:34 CEST 2009
6.8 + * Thu Oct 15 17:27:18 CEST 2009
6.9 * Generated source version: 2.0.9
6.10 *
6.11 */
7.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/IMolwindWebservice.java Thu Oct 15 16:39:48 2009 +0200
7.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/IMolwindWebservice.java Thu Oct 15 17:28:16 2009 +0200
7.3 @@ -9,7 +9,7 @@
7.4
7.5 /**
7.6 * This class was generated by Apache CXF 2.2.4
7.7 - * Thu Oct 15 16:35:46 CEST 2009
7.8 + * Thu Oct 15 17:27:34 CEST 2009
7.9 * Generated source version: 2.2.4
7.10 *
7.11 */
8.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/IOException_Exception.java Thu Oct 15 16:39:48 2009 +0200
8.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/IOException_Exception.java Thu Oct 15 17:28:16 2009 +0200
8.3 @@ -6,14 +6,14 @@
8.4
8.5 /**
8.6 * This class was generated by Apache CXF 2.2.4
8.7 - * Thu Oct 15 16:35:46 CEST 2009
8.8 + * Thu Oct 15 17:27:34 CEST 2009
8.9 * Generated source version: 2.2.4
8.10 *
8.11 */
8.12
8.13 @WebFault(name = "IOException", targetNamespace = "http://webservice.molwind.org/")
8.14 public class IOException_Exception extends Exception {
8.15 - public static final long serialVersionUID = 20091015163546L;
8.16 + public static final long serialVersionUID = 20091015172734L;
8.17
8.18 private org.molwind.webservice.IOException ioException;
8.19
9.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/JDOMException_Exception.java Thu Oct 15 16:39:48 2009 +0200
9.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/JDOMException_Exception.java Thu Oct 15 17:28:16 2009 +0200
9.3 @@ -6,14 +6,14 @@
9.4
9.5 /**
9.6 * This class was generated by Apache CXF 2.2.4
9.7 - * Thu Oct 15 16:35:46 CEST 2009
9.8 + * Thu Oct 15 17:27:34 CEST 2009
9.9 * Generated source version: 2.2.4
9.10 *
9.11 */
9.12
9.13 @WebFault(name = "JDOMException", targetNamespace = "http://webservice.molwind.org/")
9.14 public class JDOMException_Exception extends Exception {
9.15 - public static final long serialVersionUID = 20091015163546L;
9.16 + public static final long serialVersionUID = 20091015172734L;
9.17
9.18 private org.molwind.webservice.JDOMException jdomException;
9.19
10.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/MolwindWebserviceService.java Thu Oct 15 16:39:48 2009 +0200
10.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/MolwindWebserviceService.java Thu Oct 15 17:28:16 2009 +0200
10.3 @@ -15,7 +15,7 @@
10.4
10.5 /**
10.6 * This class was generated by Apache CXF 2.2.4
10.7 - * Thu Oct 15 16:35:46 CEST 2009
10.8 + * Thu Oct 15 17:27:34 CEST 2009
10.9 * Generated source version: 2.2.4
10.10 *
10.11 */
11.1 --- a/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/ObjectFactory.java Thu Oct 15 16:39:48 2009 +0200
11.2 +++ b/molwind-client/molwind-webservice/molwind-webclient/src/main/java/org/molwind/webservice/ObjectFactory.java Thu Oct 15 17:28:16 2009 +0200
11.3 @@ -37,11 +37,11 @@
11.4 }
11.5
11.6 /**
11.7 - * Create an instance of {@link IOException }
11.8 + * Create an instance of {@link GetWorldNamesResponse }
11.9 *
11.10 */
11.11 - public IOException createIOException() {
11.12 - return new IOException();
11.13 + public GetWorldNamesResponse createGetWorldNamesResponse() {
11.14 + return new GetWorldNamesResponse();
11.15 }
11.16
11.17 /**
11.18 @@ -61,11 +61,11 @@
11.19 }
11.20
11.21 /**
11.22 - * Create an instance of {@link GetWorldNamesResponse }
11.23 + * Create an instance of {@link IOException }
11.24 *
11.25 */
11.26 - public GetWorldNamesResponse createGetWorldNamesResponse() {
11.27 - return new GetWorldNamesResponse();
11.28 + public IOException createIOException() {
11.29 + return new IOException();
11.30 }
11.31
11.32 /**
12.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/webservice/IOException_Exception.class has changed
13.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/webservice/JDOMException_Exception.class has changed
14.1 Binary file molwind-client/molwind-webservice/molwind-webclient/target/classes/org/molwind/webservice/ObjectFactory.class has changed
15.1 --- a/molwind-core/pom.xml Thu Oct 15 16:39:48 2009 +0200
15.2 +++ b/molwind-core/pom.xml Thu Oct 15 17:28:16 2009 +0200
15.3 @@ -54,10 +54,6 @@
15.4 <artifactId>jung-graph-impl</artifactId>
15.5 <version>2.0</version>
15.6 </dependency>
15.7 - <dependency>
15.8 - <groupId>jung</groupId>
15.9 - <artifactId>jung</artifactId>
15.10 - </dependency>
15.11 </dependencies>
15.12
15.13 <parent>
16.1 --- a/molwind-core/src/main/java/org/molwind/graph/DefaultEntityEdge.java Thu Oct 15 16:39:48 2009 +0200
16.2 +++ b/molwind-core/src/main/java/org/molwind/graph/DefaultEntityEdge.java Thu Oct 15 17:28:16 2009 +0200
16.3 @@ -19,7 +19,7 @@
16.4
16.5 import org.molwind.model.Relationship;
16.6
16.7 -import edu.uci.ics.jung.graph.impl.UndirectedSparseEdge;
16.8 +
16.9
16.10 /**
16.11 * DefaultEntityEdge represents an edge in the entity graph.
16.12 @@ -27,10 +27,12 @@
16.13 * @author <a href="mailto:oliver.karch@molwind.org">Oliver Karch</a>
16.14 * @version 1.0
16.15 */
16.16 -public class DefaultEntityEdge extends UndirectedSparseEdge
16.17 -implements EntityEdge {
16.18 +public class DefaultEntityEdge implements EntityEdge {
16.19
16.20 private Relationship relationship;
16.21 + private EntityVertex v1;
16.22 + private EntityVertex v2;
16.23 +
16.24
16.25 /**
16.26 * DefaultEntityEdge constructor.
16.27 @@ -40,10 +42,13 @@
16.28 * @param vertex2
16.29 * second Vertex
16.30 */
16.31 - public DefaultEntityEdge(final DefaultEntityVertex vertex1,
16.32 - final DefaultEntityVertex vertex2) {
16.33 - super(vertex1, vertex2);
16.34 - }
16.35 + public DefaultEntityEdge(final DefaultEntityVertex vertex1,
16.36 + final DefaultEntityVertex vertex2) {
16.37 +
16.38 + this.v1=vertex1;
16.39 + this.v2=vertex2;
16.40 + }
16.41 +
16.42
16.43 /**
16.44 * Get the Relationship value.
17.1 --- a/molwind-core/src/main/java/org/molwind/graph/DefaultEntityGraph.java Thu Oct 15 16:39:48 2009 +0200
17.2 +++ b/molwind-core/src/main/java/org/molwind/graph/DefaultEntityGraph.java Thu Oct 15 17:28:16 2009 +0200
17.3 @@ -27,7 +27,7 @@
17.4 import org.molwind.model.Relationship;
17.5 import org.molwind.model.WorldEntity;
17.6
17.7 -import edu.uci.ics.jung.graph.impl.SparseGraph;
17.8 +import edu.uci.ics.jung.graph.SparseGraph;
17.9 import edu.uci.ics.jung.io.GraphMLWriter;
17.10
17.11
17.12 @@ -67,7 +67,7 @@
17.13 vertex = new DefaultEntityVertex();
17.14 vertex.setId(vertexId);
17.15 entities.put(vertexId, vertex);
17.16 - graph.addVertex(vertex);
17.17 + graph.addVertex((Object)vertex);
17.18 }
17.19
17.20 vertex.setEntity(entity);
17.21 @@ -126,7 +126,7 @@
17.22
17.23 DefaultEntityEdge edge = new DefaultEntityEdge(vertex1, vertex2);
17.24 edge.setRelationship(relation);
17.25 - graph.addEdge(edge);
17.26 + //TODO.....find solution for the new jung2 api graph.addEdge(edge);
17.27 }
17.28
17.29 /**
18.1 --- a/molwind-core/src/main/java/org/molwind/graph/DefaultEntityVertex.java Thu Oct 15 16:39:48 2009 +0200
18.2 +++ b/molwind-core/src/main/java/org/molwind/graph/DefaultEntityVertex.java Thu Oct 15 17:28:16 2009 +0200
18.3 @@ -21,7 +21,7 @@
18.4
18.5 import org.molwind.model.WorldEntity;
18.6
18.7 -import edu.uci.ics.jung.graph.impl.SparseVertex;
18.8 +
18.9
18.10 /**
18.11 * DefaultEntityVertex represents the default vertex of a DefaultEntityGraph
18.12 @@ -30,7 +30,7 @@
18.13 * @author <a href="mailto:oliver.karch@molwind.org">Oliver Karch</a>
18.14 * @version 1.0
18.15 */
18.16 -public class DefaultEntityVertex extends SparseVertex implements EntityVertex {
18.17 +public class DefaultEntityVertex implements EntityVertex {
18.18
18.19 private String id;
18.20 private WorldEntity entity;
19.1 --- a/molwind-core/src/main/java/org/molwind/io/BasePathSupport.java Thu Oct 15 16:39:48 2009 +0200
19.2 +++ b/molwind-core/src/main/java/org/molwind/io/BasePathSupport.java Thu Oct 15 17:28:16 2009 +0200
19.3 @@ -4,7 +4,22 @@
19.4 *
19.5 *
19.6 */
19.7 -
19.8 +/*
19.9 + * This file is part of Molwind.
19.10 + *
19.11 + * Molwind is free software: you can redistribute it and/or modify
19.12 + * it under the terms of the GNU General Public License as published by
19.13 + * the Free Software Foundation, either version 3 of the License, or
19.14 + * (at your option) any later version.
19.15 + *
19.16 + * Molwind is distributed in the hope that it will be useful,
19.17 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19.18 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19.19 + * GNU General Public License for more details.
19.20 + *
19.21 + * You should have received a copy of the GNU General Public License
19.22 + * along with Molwind. If not, see <http://www.gnu.org/licenses/>.
19.23 + */
19.24
19.25 public interface BasePathSupport{
19.26 /**
20.1 Binary file molwind-core/target/classes/org/molwind/graph/DefaultEntityEdge.class has changed
21.1 Binary file molwind-core/target/classes/org/molwind/graph/DefaultEntityGraph.class has changed
22.1 Binary file molwind-core/target/classes/org/molwind/graph/DefaultEntityVertex.class has changed
23.1 --- a/molwind-server/src/main/java/org/molwind/servlet/AbstractCommand.java Thu Oct 15 16:39:48 2009 +0200
23.2 +++ b/molwind-server/src/main/java/org/molwind/servlet/AbstractCommand.java Thu Oct 15 17:28:16 2009 +0200
23.3 @@ -1,5 +1,20 @@
23.4 package org.molwind.servlet;
23.5 -
23.6 +/*
23.7 + * This file is part of Molwind.
23.8 + *
23.9 + * Molwind is free software: you can redistribute it and/or modify
23.10 + * it under the terms of the GNU General Public License as published by
23.11 + * the Free Software Foundation, either version 3 of the License, or
23.12 + * (at your option) any later version.
23.13 + *
23.14 + * Molwind is distributed in the hope that it will be useful,
23.15 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
23.16 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23.17 + * GNU General Public License for more details.
23.18 + *
23.19 + * You should have received a copy of the GNU General Public License
23.20 + * along with Molwind. If not, see <http://www.gnu.org/licenses/>.
23.21 + */
23.22 import java.io.IOException;
23.23
23.24
24.1 --- a/molwind-server/src/main/java/org/molwind/servlet/Command.java Thu Oct 15 16:39:48 2009 +0200
24.2 +++ b/molwind-server/src/main/java/org/molwind/servlet/Command.java Thu Oct 15 17:28:16 2009 +0200
24.3 @@ -1,5 +1,20 @@
24.4 package org.molwind.servlet;
24.5 -
24.6 +/*
24.7 + * This file is part of Molwind.
24.8 + *
24.9 + * Molwind is free software: you can redistribute it and/or modify
24.10 + * it under the terms of the GNU General Public License as published by
24.11 + * the Free Software Foundation, either version 3 of the License, or
24.12 + * (at your option) any later version.
24.13 + *
24.14 + * Molwind is distributed in the hope that it will be useful,
24.15 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24.16 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24.17 + * GNU General Public License for more details.
24.18 + *
24.19 + * You should have received a copy of the GNU General Public License
24.20 + * along with Molwind. If not, see <http://www.gnu.org/licenses/>.
24.21 + */
24.22
24.23 import javax.servlet.http.HttpServletRequest;
24.24 import javax.servlet.http.HttpServletResponse;
25.1 --- a/molwind-server/src/main/java/org/molwind/servlet/GetImageCommand.java Thu Oct 15 16:39:48 2009 +0200
25.2 +++ b/molwind-server/src/main/java/org/molwind/servlet/GetImageCommand.java Thu Oct 15 17:28:16 2009 +0200
25.3 @@ -1,5 +1,20 @@
25.4 package org.molwind.servlet;
25.5 -
25.6 +/*
25.7 + * This file is part of Molwind.
25.8 + *
25.9 + * Molwind is free software: you can redistribute it and/or modify
25.10 + * it under the terms of the GNU General Public License as published by
25.11 + * the Free Software Foundation, either version 3 of the License, or
25.12 + * (at your option) any later version.
25.13 + *
25.14 + * Molwind is distributed in the hope that it will be useful,
25.15 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25.16 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25.17 + * GNU General Public License for more details.
25.18 + *
25.19 + * You should have received a copy of the GNU General Public License
25.20 + * along with Molwind. If not, see <http://www.gnu.org/licenses/>.
25.21 + */
25.22
25.23
25.24 import org.molwind.util.MolwindServerConfiguration;
26.1 --- a/molwind-server/src/main/java/org/molwind/servlet/GetWorldNamesCommand.java Thu Oct 15 16:39:48 2009 +0200
26.2 +++ b/molwind-server/src/main/java/org/molwind/servlet/GetWorldNamesCommand.java Thu Oct 15 17:28:16 2009 +0200
26.3 @@ -1,5 +1,20 @@
26.4 package org.molwind.servlet;
26.5 -
26.6 +/*
26.7 + * This file is part of Molwind.
26.8 + *
26.9 + * Molwind is free software: you can redistribute it and/or modify
26.10 + * it under the terms of the GNU General Public License as published by
26.11 + * the Free Software Foundation, either version 3 of the License, or
26.12 + * (at your option) any later version.
26.13 + *
26.14 + * Molwind is distributed in the hope that it will be useful,
26.15 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
26.16 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26.17 + * GNU General Public License for more details.
26.18 + *
26.19 + * You should have received a copy of the GNU General Public License
26.20 + * along with Molwind. If not, see <http://www.gnu.org/licenses/>.
26.21 + */
26.22
26.23
26.24 import java.io.IOException;
27.1 Binary file molwind-server/target/classes/org/molwind/servlet/AbstractCommand.class has changed
28.1 Binary file molwind-server/target/classes/org/molwind/servlet/GetImageCommand.class has changed
29.1 Binary file molwind-server/target/classes/org/molwind/servlet/GetWorldNamesCommand.class has changed