Fixing the build scripts to build with Axis2 0.92
Removed the wsdl-codegen scripts from maven.xml (We are not using data binding for the moment)
Removed the TCPmon Debugging hacks
git-svn-id: https://svn.apache.org/repos/asf/webservices/kandula/trunk/java@292444 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven.xml b/maven.xml
index 5a0b993..159bdd5 100644
--- a/maven.xml
+++ b/maven.xml
@@ -17,62 +17,6 @@
</postGoal>
<preGoal name="java:compile">
- <mkdir dir="${maven.build.dir}/stubs/src"/>
-
- <ant:echo>+----------------------------------------+</ant:echo>
- <ant:echo>| Code Generating For WS-Coordination |</ant:echo>
- <ant:echo>+----------------------------------------+</ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java"
- failonerror="true" fork="yes">
- <classpath>
- <path refid="maven.dependency.classpath"/>
- </classpath>
- <arg value="-ss"/>
- <arg value="-uri"/>
- <arg value="${basedir}/schema/wscoor.wsdl"/>
- <arg value="-o"/>
- <arg value="${maven.build.dir}/stubs/src/wscoor"/>
- </java>
-
- <ant:echo>+------------------------------------------+</ant:echo>
- <ant:echo>| Code Generating For WS-AtomicTransaction |</ant:echo>
- <ant:echo>+------------------------------------------+ </ant:echo>
- <java classname="org.apache.axis2.wsdl.WSDL2Java"
- failonerror="true" fork="yes">
- <classpath>
- <path refid="maven.dependency.classpath"/>
- </classpath>
- <arg value="-uri"/>
- <arg value="${basedir}/schema/wsat.wsdl"/>
- <arg value="-o"/>
- <arg value="${maven.build.dir}/stubs/src/wsat"/>
- </java>
-
- <ant:echo>Copying generated *Class(.class)* file + it's resources to Classpath</ant:echo>
- <mkdir dir="${maven.build.dir}/classes/schema/system/foo"/>
- <copy todir="${maven.build.dir}/classes/schema/system/foo">
- <fileset dir="${maven.build.dir}/stubs/src/wscoor/schema/system/foo">
- <include name="*.*"/>
- </fileset>
- </copy>
- <ant:path
- id="stubs.src.wscoor.dir"
- location="${maven.build.dir}/stubs/src/wscoor"/>
- <ant:path
- id="stubs.src.wsat.dir"
- location="${maven.build.dir}/stubs/src/wsat"/>
-
- <maven:addPath
- id="maven.compile.src.set"
- refid="stubs.src.wscoor.dir"/>
- <maven:addPath
- id="maven.compile.src.set"
- refid="stubs.src.wsat.dir"/>
- </preGoal>
- <!--
- <goal name="build-samples">
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/"/>
- </goal>
- -->
+ </preGoal>
</project>
diff --git a/project.xml b/project.xml
index 1d3d5d0..1ab633f 100644
--- a/project.xml
+++ b/project.xml
@@ -36,7 +36,7 @@
<!-- the project home page -->
<url>http://ws.apache.org/kandula/</url>
- <issueTrackingUrl>http://nagoya.apache.org/jira/browse/WSFX</issueTrackingUrl>
+ <issueTrackingUrl>http://issues.apache.org/jira/browse/KAND</issueTrackingUrl>
<siteAddress>ws.apache.org</siteAddress>
<siteDirectory>/kandula/</siteDirectory>
<distributionDirectory>/www/ws.apache.org/builds/</distributionDirectory>
@@ -45,8 +45,8 @@
the connection element has the form:
scm:<system>:<system specific connection string> -->
<repository>
- <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:ws-fx/kandula/</connection>
- <url>http://cvs.apache.org/viewcvs.cgi/ws-fx/kandula/</url>
+ <connection>scm|svn|https://svn.apache.org/repos/asf/webservices/kandula/trunk/java/</connection>
+ <url>http://svn.apache.org/repos/asf/webservices/kandula/trunk/java/</url>
</repository>
<!-- any mailing lists for the project -->
@@ -93,17 +93,6 @@
<build>
<nagEmailAddress>kandula-dev@ws.apache.org</nagEmailAddress>
<sourceDirectory>src</sourceDirectory>
-
-<!--
- <resources>
- <resource>
- <directory>src/conf</directory>
- <includes>
- <include>*.conf</include>
- </includes>
- </resource>
- </resources>
--->
</build>
<!-- ============ -->
@@ -120,51 +109,36 @@
<properties>
<module>true</module>
</properties>
- </dependency>
-
+ </dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis2</artifactId>
- <version>0.91</version>
- </dependency>
-
- <!--
- <dependency>
- <groupId>axis</groupId>
+ <groupId>axis2</groupId>
<artifactId>axis2-core</artifactId>
- <version>0.9</version>
+ <version>0.92</version>
</dependency>
<dependency>
- <groupId>axis</groupId>
+ <groupId>axis2</groupId>
<artifactId>axis2-xml</artifactId>
- <version>0.9</version>
+ <version>0.92</version>
</dependency>
<dependency>
- <groupId>axis</groupId>
+ <groupId>axis2</groupId>
<artifactId>axis2-wsdl</artifactId>
- <version>0.9</version>
+ <version>0.92</version>
</dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>addressing</artifactId>
- <version>0.9</version>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-addressing</artifactId>
+ <version>0.92</version>
</dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis2-tools</artifactId>
- <version>0.9</version>
- </dependency>
-
- <dependency>
- <groupId>axis</groupId>
+ <groupId>axis2</groupId>
<artifactId>axis2-common</artifactId>
- <version>0.9</version>
+ <version>0.92</version>
</dependency>
- -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -173,18 +147,8 @@
<module>true</module>
</properties>
</dependency>
-
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.1.1-dev</version>
- <properties>
- <module>true</module>
- </properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
- </dependency>
-
- <dependency>
+
+ <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0-rc2</version>
@@ -203,6 +167,14 @@
<url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.1.2-dev</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
@@ -210,10 +182,9 @@
<properties>
<module>true</module>
</properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
-
- <dependency>
+
+ <dependency>
<groupId>axis</groupId>
<artifactId>axis-wsdl4j</artifactId>
<version>1.2</version>
@@ -221,35 +192,17 @@
<module>true</module>
</properties>
</dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- <version>1.3.1-rc5</version>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
<properties>
<module>true</module>
</properties>
</dependency>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>1.0.2-rc4</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.0.0-beta1</version>
- <type>jar</type>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
-
+
+
+
</dependencies>
<!-- ================================= -->
@@ -291,27 +244,6 @@
-->
</unitTest>
- <resources>
- <resource>
- <directory>conf</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>test</directory>
- <includes>
- <include>**/*.jpg</include>
- </includes>
- </resource>
- </resources>
</build>
<!-- ======= -->
diff --git a/src/org/apache/kandula/utility/EndpointReferenceFactory.java b/src/org/apache/kandula/utility/EndpointReferenceFactory.java
index 9cd9d0a..5e97332 100644
--- a/src/org/apache/kandula/utility/EndpointReferenceFactory.java
+++ b/src/org/apache/kandula/utility/EndpointReferenceFactory.java
@@ -48,6 +48,7 @@
String location = null;
private EndpointReferenceFactory() {
+/*
InputStream in = getClass().getClassLoader().getResourceAsStream(
PROPERTY_FILE);
properties = new Properties();
@@ -65,6 +66,7 @@
else
throw new RuntimeException(e);
}
+*/
}
public static EndpointReferenceFactory getInstance() {
@@ -76,7 +78,7 @@
public EndpointReference getRegistrationEndpoint(String id) {
//TODO set this somehow reading the conf file
EndpointReference epr = new EndpointReference(
- "http://localhost:8082/axis/services/RegistrationCoordinator");
+ "http://localhost:8081/axis/services/RegistrationCoordinator");
AnyContentType refProperties = new AnyContentType();
refProperties.addReferenceValue(
new QName("http://ws.apache.org/Kandula", "id"), id);
@@ -97,7 +99,7 @@
public EndpointReference getCompletionEndpoint(String id) {
//TODO set this somehow reading the conf file
EndpointReference epr = new EndpointReference(
- "http://localhost:8082/axis/services/RegistrationCoordinator");
+ "http://localhost:8081/axis/services/RegistrationCoordinator");
AnyContentType refProperties = new AnyContentType();
refProperties.addReferenceValue(
new QName("http://ws.apache.org/Kandula", "id"), id);
@@ -108,7 +110,7 @@
public EndpointReference get2PCEndpoint(String id) {
//TODO set this somehow reading the conf file
EndpointReference epr = new EndpointReference(
- "http://localhost:8082/axis/services/RegistrationCoordinator");
+ "http://localhost:8081/axis/services/RegistrationCoordinator");
AnyContentType refProperties = new AnyContentType();
refProperties.addReferenceValue(
new QName("http://ws.apache.org/Kandula", "id"), id);
diff --git a/src/org/apache/kandula/utility/KandulaListener.java b/src/org/apache/kandula/utility/KandulaListener.java
index a7b6444..a716647 100644
--- a/src/org/apache/kandula/utility/KandulaListener.java
+++ b/src/org/apache/kandula/utility/KandulaListener.java
@@ -1,104 +1,104 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.kandula.utility;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.receivers.AbstractMessageReceiver;
-import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
-import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.axis2.util.Utils;
-import org.apache.kandula.Constants;
-import org.apache.wsdl.WSDLService;
-
-import javax.xml.namespace.QName;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-/**
- * @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
- */
-public class KandulaListener {
-
- private static KandulaListener instance = null;
-
- private ConfigurationContext responseConfigurationContext;
-
- protected static org.apache.axis2.description.OperationDescription[] operations;
-
- private SimpleHTTPServer receiver = null;
-
- private boolean serverStarted = false;
-
- public static final int SERVER_PORT = 5059;
-
- private KandulaListener() throws IOException {
- responseConfigurationContext = new org.apache.axis2.context.ConfigurationContextFactory()
- .buildClientConfigurationContext(".");
- receiver = new SimpleHTTPServer(responseConfigurationContext,
- SERVER_PORT);
-
- }
-
- public static KandulaListener getInstance() throws IOException {
- if (instance == null) {
- instance = new KandulaListener();
- }
- return instance;
- }
-
- public void start() throws IOException {
- if (!serverStarted) {
-
- receiver.start();
- serverStarted = true;
- System.out.print("Server started on port " + SERVER_PORT + ".....");
- }
-
- }
-
- public void stop() {
- receiver.stop();
- serverStarted = false;
- }
-
- /**
- * @param serviceName
- * @param operationName
- * @throws AxisFault To add services with only one operation, which is the
- * frequent case in reponses
- */
- public void addService(ServiceDescription service) throws AxisFault {
- org.apache.axis2.description.OperationDescription responseOperationDesc;
-
- service.setClassLoader(Thread.currentThread().getContextClassLoader());
-
- responseConfigurationContext.getAxisConfiguration().addService(service);
- Utils.resolvePhases(receiver.getSystemContext().getAxisConfiguration(),
- service);
- }
-
- public String getHost() throws UnknownHostException {
- return "http://" + InetAddress.getLocalHost().getHostAddress() + ":" + 5060
- + "/axis2/services/";
- }
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.kandula.utility;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.receivers.AbstractMessageReceiver;
+import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
+import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.axis2.util.Utils;
+import org.apache.kandula.Constants;
+import org.apache.wsdl.WSDLService;
+
+import javax.xml.namespace.QName;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
+ */
+public class KandulaListener {
+
+ private static KandulaListener instance = null;
+
+ private ConfigurationContext responseConfigurationContext;
+
+ protected static org.apache.axis2.description.OperationDescription[] operations;
+
+ private SimpleHTTPServer receiver = null;
+
+ private boolean serverStarted = false;
+
+ public static final int SERVER_PORT = 5059;
+
+ private KandulaListener() throws IOException {
+ responseConfigurationContext = new org.apache.axis2.context.ConfigurationContextFactory()
+ .buildClientConfigurationContext(".");
+ receiver = new SimpleHTTPServer(responseConfigurationContext,
+ SERVER_PORT);
+
+ }
+
+ public static KandulaListener getInstance() throws IOException {
+ if (instance == null) {
+ instance = new KandulaListener();
+ }
+ return instance;
+ }
+
+ public void start() throws IOException {
+ if (!serverStarted) {
+
+ receiver.start();
+ serverStarted = true;
+ System.out.print("Server started on port " + SERVER_PORT + ".....");
+ }
+
+ }
+
+ public void stop() {
+ receiver.stop();
+ serverStarted = false;
+ }
+
+ /**
+ * @param serviceName
+ * @param operationName
+ * @throws AxisFault To add services with only one operation, which is the
+ * frequent case in reponses
+ */
+ public void addService(ServiceDescription service) throws AxisFault {
+ org.apache.axis2.description.OperationDescription responseOperationDesc;
+
+ service.setClassLoader(Thread.currentThread().getContextClassLoader());
+
+ responseConfigurationContext.getAxisConfiguration().addService(service);
+ Utils.resolvePhases(receiver.getSystemContext().getAxisConfiguration(),
+ service);
+ }
+
+ public String getHost() throws UnknownHostException {
+ return "http://" + InetAddress.getLocalHost().getHostAddress() + ":" + SERVER_PORT
+ + "/axis2/services/";
+ }
}
\ No newline at end of file
diff --git a/test/org/apache/kandula/integration/CreateCoordinationContextTest.java b/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
index b4595be..c70e607 100644
--- a/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
+++ b/test/org/apache/kandula/integration/CreateCoordinationContextTest.java
@@ -1,92 +1,92 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.kandula.integration;
-
-/**
- * @author <a href="mailto:thilina@opensource.lk">Thilina Gunarathne </a>
- */
-
-import junit.framework.TestCase;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.kandula.Constants;
-import org.apache.kandula.initiator.TransactionManager;
-
-import java.io.File;
-
-public class CreateCoordinationContextTest extends TestCase {
-
- private String repository = "test-resources/testing-repository";
-
- private SimpleHTTPServer server;
-
- private boolean finish = false;
-
-
- public CreateCoordinationContextTest() {
- super(CreateCoordinationContextTest.class.getName());
- }
-
- public CreateCoordinationContextTest(String testName) {
- super(testName);
- }
-
- protected void setUp() throws Exception {
- ConfigurationContextFactory erfac = new ConfigurationContextFactory();
- File file = new File(repository);
- if (!file.exists()) {
- throw new Exception(
- "repository directory " + file.getAbsolutePath() +
- " does not exists");
- }
- ConfigurationContext er = erfac.buildConfigurationContext(
- file.getAbsolutePath());
-
- server = new SimpleHTTPServer(er, 8081);
-
- try {
- server.start();
- System.out.print(
- "Server started on port " + 8081 +
- ".....");
- } finally {
-
- }
-
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e1) {
- throw new AxisFault("Thread interuptted", e1);
- }
-
-
- }
-
- protected void tearDown() throws Exception {
- server.stop();
- }
-
-
- public void testEchoXMLSync() throws Exception {
- TransactionManager tm = new TransactionManager(Constants.WS_AT, new EndpointReference("http://localhost:8082/axis/services/ActivationCoordinator"));
- //Thread.sleep(100000);
- tm.begin();
- }
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.kandula.integration;
+
+/**
+ * @author <a href="mailto:thilina@opensource.lk">Thilina Gunarathne </a>
+ */
+
+import junit.framework.TestCase;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.kandula.Constants;
+import org.apache.kandula.initiator.TransactionManager;
+
+import java.io.File;
+
+public class CreateCoordinationContextTest extends TestCase {
+
+ private String repository = "test-resources/testing-repository";
+
+ private SimpleHTTPServer server;
+
+ private boolean finish = false;
+
+
+ public CreateCoordinationContextTest() {
+ super(CreateCoordinationContextTest.class.getName());
+ }
+
+ public CreateCoordinationContextTest(String testName) {
+ super(testName);
+ }
+
+ protected void setUp() throws Exception {
+ ConfigurationContextFactory erfac = new ConfigurationContextFactory();
+ File file = new File(repository);
+ if (!file.exists()) {
+ throw new Exception(
+ "repository directory " + file.getAbsolutePath() +
+ " does not exists");
+ }
+ ConfigurationContext er = erfac.buildConfigurationContext(
+ file.getAbsolutePath());
+
+ server = new SimpleHTTPServer(er, 8081);
+
+ try {
+ server.start();
+ System.out.print(
+ "Server started on port " + 8081 +
+ ".....");
+ } finally {
+
+ }
+
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e1) {
+ throw new AxisFault("Thread interuptted", e1);
+ }
+
+
+ }
+
+ protected void tearDown() throws Exception {
+ server.stop();
+ }
+
+
+ public void testEchoXMLSync() throws Exception {
+ TransactionManager tm = new TransactionManager(Constants.WS_AT, new EndpointReference("http://localhost:8081/axis/services/ActivationCoordinator"));
+ //Thread.sleep(100000);
+ tm.begin();
+ }
}
\ No newline at end of file
