wise SVN: r446 - in core/trunk: distribution/main/resouces/samples/helloWorldGroovy/resources/META-INF and 4 other directories.
by wise-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-20 10:22:29 -0400 (Fri, 20 Jul 2012)
New Revision: 446
Removed:
core/trunk/distribution/main/resouces/samples/helloWorld/resources/META-INF/jboss-beans.xml
core/trunk/distribution/main/resouces/samples/helloWorldGroovy/resources/META-INF/jboss-beans.xml
core/trunk/distribution/main/resouces/samples/helloWorldRuby/resources/META-INF/jboss-beans.xml
core/trunk/distribution/main/resouces/samples/interactiveHelloWorld/resources/META-INF/jboss-beans.xml
core/trunk/distribution/main/resouces/samples/jaxrs/resources/META-INF/jboss-beans.xml
core/trunk/integration-testsuite/common/src/test/resources/META-INF/jboss-beans.xml
Log:
Removing old files
Deleted: core/trunk/distribution/main/resouces/samples/helloWorld/resources/META-INF/jboss-beans.xml
===================================================================
--- core/trunk/distribution/main/resouces/samples/helloWorld/resources/META-INF/jboss-beans.xml 2012-07-20 13:18:55 UTC (rev 445)
+++ core/trunk/distribution/main/resouces/samples/helloWorld/resources/META-INF/jboss-beans.xml 2012-07-20 14:22:29 UTC (rev 446)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer">
-
- <bean name="WiseKernelLocator"
- class="org.jboss.wise.core.jbossmc.KernelUtil">
- <property name="kernel">
- <inject bean="jboss.kernel:service=Kernel" />
- </property>
- </bean>
-
- <bean name="WiseClientConfiguration" class="org.jboss.wise.core.jbossmc.beans.WiseClientConfiguration" >
- <property name="defaultUserName">foo</property>
- <property name="defaultPassword">pwd</property>
- <property name="defaultTmpDeployDir">/home/oracle/temp</property>
- <property name="logConfig">resources/META-INF/wise-log4j.xml</property>
- </bean>
-
- <bean name="WSDynamicClientFactory" class="org.jboss.wise.core.jbossmc.beans.ReflectionWSDynamicClientFactory">
- <property name="config"><inject bean="WiseClientConfiguration"></inject> </property>
- </bean>
-
- <bean name="WSConsumer" class="org.jboss.wise.core.consumer.impl.jbosswsnative.WSImportImpl">
- <property name="keepSource">true</property>
- <property name="verbose">true</property>
- </bean>
-
-
-</deployment>
Deleted: core/trunk/distribution/main/resouces/samples/helloWorldGroovy/resources/META-INF/jboss-beans.xml
===================================================================
--- core/trunk/distribution/main/resouces/samples/helloWorldGroovy/resources/META-INF/jboss-beans.xml 2012-07-20 13:18:55 UTC (rev 445)
+++ core/trunk/distribution/main/resouces/samples/helloWorldGroovy/resources/META-INF/jboss-beans.xml 2012-07-20 14:22:29 UTC (rev 446)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer">
-
- <bean name="WiseKernelLocator"
- class="org.jboss.wise.core.jbossmc.KernelUtil">
- <property name="kernel">
- <inject bean="jboss.kernel:service=Kernel" />
- </property>
- </bean>
-
- <bean name="WiseClientConfiguration" class="org.jboss.wise.core.jbossmc.beans.WiseClientConfiguration" >
- <property name="defaultUserName">foo</property>
- <property name="defaultPassword">pwd</property>
- <property name="defaultTmpDeployDir">/home/oracle/temp</property>
- <property name="logConfig">resources/META-INF/wise-log4j.xml</property>
- </bean>
-
- <bean name="WSDynamicClientFactory" class="org.jboss.wise.core.jbossmc.beans.ReflectionWSDynamicClientFactory">
- <property name="config"><inject bean="WiseClientConfiguration"></inject> </property>
- </bean>
-
- <bean name="WSConsumer" class="org.jboss.wise.core.consumer.impl.jbosswsnative.WSImportImpl">
- <property name="keepSource">true</property>
- <property name="verbose">true</property>
- </bean>
-
-
-</deployment>
Deleted: core/trunk/distribution/main/resouces/samples/helloWorldRuby/resources/META-INF/jboss-beans.xml
===================================================================
--- core/trunk/distribution/main/resouces/samples/helloWorldRuby/resources/META-INF/jboss-beans.xml 2012-07-20 13:18:55 UTC (rev 445)
+++ core/trunk/distribution/main/resouces/samples/helloWorldRuby/resources/META-INF/jboss-beans.xml 2012-07-20 14:22:29 UTC (rev 446)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer">
-
- <bean name="WiseKernelLocator"
- class="org.jboss.wise.core.jbossmc.KernelUtil">
- <property name="kernel">
- <inject bean="jboss.kernel:service=Kernel" />
- </property>
- </bean>
-
- <bean name="WiseClientConfiguration" class="org.jboss.wise.core.jbossmc.beans.WiseClientConfiguration" >
- <property name="defaultUserName">foo</property>
- <property name="defaultPassword">pwd</property>
- <property name="defaultTmpDeployDir">/home/oracle/temp</property>
- <property name="logConfig">resources/META-INF/wise-log4j.xml</property>
- </bean>
-
- <bean name="WSDynamicClientFactory" class="org.jboss.wise.core.jbossmc.beans.ReflectionWSDynamicClientFactory">
- <property name="config"><inject bean="WiseClientConfiguration"></inject> </property>
- </bean>
-
- <bean name="WSConsumer" class="org.jboss.wise.core.consumer.impl.jbosswsnative.WSImportImpl">
- <property name="keepSource">true</property>
- <property name="verbose">true</property>
- </bean>
-
-
-</deployment>
Deleted: core/trunk/distribution/main/resouces/samples/interactiveHelloWorld/resources/META-INF/jboss-beans.xml
===================================================================
--- core/trunk/distribution/main/resouces/samples/interactiveHelloWorld/resources/META-INF/jboss-beans.xml 2012-07-20 13:18:55 UTC (rev 445)
+++ core/trunk/distribution/main/resouces/samples/interactiveHelloWorld/resources/META-INF/jboss-beans.xml 2012-07-20 14:22:29 UTC (rev 446)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer">
-
- <bean name="WiseKernelLocator"
- class="org.jboss.wise.core.jbossmc.KernelUtil">
- <property name="kernel">
- <inject bean="jboss.kernel:service=Kernel" />
- </property>
- </bean>
-
- <bean name="WiseClientConfiguration" class="org.jboss.wise.core.jbossmc.beans.WiseClientConfiguration" >
- <property name="defaultUserName">foo</property>
- <property name="defaultPassword">pwd</property>
- <property name="defaultTmpDeployDir">/home/oracle/temp</property>
- <property name="logConfig">resources/META-INF/wise-log4j.xml</property>
- </bean>
-
- <bean name="WSDynamicClientFactory" class="org.jboss.wise.core.jbossmc.beans.ReflectionWSDynamicClientFactory">
- <property name="config"><inject bean="WiseClientConfiguration"></inject> </property>
- </bean>
-
- <bean name="WSConsumer" class="org.jboss.wise.core.consumer.impl.jbosswsnative.WSImportImpl">
- <property name="keepSource">true</property>
- <property name="verbose">true</property>
- </bean>
-
-
-</deployment>
Deleted: core/trunk/distribution/main/resouces/samples/jaxrs/resources/META-INF/jboss-beans.xml
===================================================================
--- core/trunk/distribution/main/resouces/samples/jaxrs/resources/META-INF/jboss-beans.xml 2012-07-20 13:18:55 UTC (rev 445)
+++ core/trunk/distribution/main/resouces/samples/jaxrs/resources/META-INF/jboss-beans.xml 2012-07-20 14:22:29 UTC (rev 446)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer">
-
- <bean name="WiseKernelLocator"
- class="org.jboss.wise.core.jbossmc.KernelUtil">
- <property name="kernel">
- <inject bean="jboss.kernel:service=Kernel" />
- </property>
- </bean>
-
- <bean name="WiseClientConfiguration" class="org.jboss.wise.core.jbossmc.beans.WiseClientConfiguration" >
- <property name="defaultUserName">foo</property>
- <property name="defaultPassword">pwd</property>
- <property name="defaultTmpDeployDir">/home/oracle/temp</property>
- <property name="logConfig">resources/META-INF/wise-log4j.xml</property>
- </bean>
-
- <bean name="WSDynamicClientFactory" class="org.jboss.wise.core.jbossmc.beans.ReflectionWSDynamicClientFactory">
- <property name="config"><inject bean="WiseClientConfiguration"></inject> </property>
- </bean>
-
- <bean name="WSConsumer" class="org.jboss.wise.core.consumer.impl.jbosswsnative.WSImportImpl">
- <property name="keepSource">true</property>
- <property name="verbose">true</property>
- </bean>
-
-
-</deployment>
Deleted: core/trunk/integration-testsuite/common/src/test/resources/META-INF/jboss-beans.xml
===================================================================
--- core/trunk/integration-testsuite/common/src/test/resources/META-INF/jboss-beans.xml 2012-07-20 13:18:55 UTC (rev 445)
+++ core/trunk/integration-testsuite/common/src/test/resources/META-INF/jboss-beans.xml 2012-07-20 14:22:29 UTC (rev 446)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer">
-
- <bean name="WiseKernelLocator" class="org.jboss.wise.core.jbossmc.KernelUtil">
- <property name="kernel">
- <inject bean="jboss.kernel:service=Kernel" />
- </property>
- </bean>
-
- <bean name="WiseClientConfiguration"
- class="org.jboss.wise.core.jbossmc.beans.WiseClientConfiguration">
- <property name="defaultUserName">foo</property>
- <property name="defaultPassword">pwd</property>
- <property name="defaultTmpDeployDir">target/temp</property>
-
- </bean>
-
- <bean name="WSDynamicClientFactory"
- class="org.jboss.wise.core.jbossmc.beans.ReflectionWSDynamicClientFactory">
- <property name="config">
- <inject bean="WiseClientConfiguration"></inject>
- </property>
- </bean>
-
- <bean name="WSConsumer"
- class="org.jboss.wise.core.consumer.impl.jbosswsnative.WSImportImpl">
- <property name="keepSource">true</property>
- <property name="verbose">true</property>
- </bean>
-
- <bean name="WSSEHelloWorld"
- class="org.jboss.wise.core.wsextensions.impl.jbosswsnative.NativeSecurityConfig">
- <property name="configFileURL">WEB-INF/wsse/jboss-wsse-client.xml</property>
- <property name="configName">Standard WSSecurity Client</property>
- </bean>
-
- <bean name="WSAddressingAndSecurityIntegrationTest"
- class="org.jboss.wise.core.wsextensions.impl.jbosswsnative.NativeSecurityConfig">
- <property name="configFileURL">WEB-INF/wsaandwsse/jboss-wsse-client.xml</property>
- <property name="configName">Standard WSSecurity Client</property>
- </bean>
-
- <bean name="WSSEDefault"
- class="org.jboss.wise.core.wsextensions.impl.jbosswsnative.NativeSecurityConfig">
- <property name="configFileURL">WEB-INF/wsse/jboss-wsse-client.xml</property>
- <property name="configName">Standard WSSecurity Client</property>
- </bean>
-
-
-
- <bean name="EnablerDelegate"
- class="org.jboss.wise.core.wsextensions.impl.jbosswsnative.ReflectionEnablerDelegate">
- <property name="securityConfigMap">
- <map class="java.util.HashMap" keyClass="java.lang.String">
- <entry>
- <key>HelloImplPort</key>
- <value>
- <inject bean="WSSEHelloWorld" />
- </value>
- </entry>
- <entry>
- <key>WSAandWSSEImplPort</key>
- <value>
- <inject bean="WSAddressingAndSecurityIntegrationTest" />
- </value>
- </entry>
- </map>
- </property>
-
- </bean>
-
-
-
-
-</deployment>
12 years, 5 months
wise SVN: r445 - in core/trunk: distribution/main/assembly and 1 other directory.
by wise-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-20 09:18:55 -0400 (Fri, 20 Jul 2012)
New Revision: 445
Modified:
core/trunk/distribution/main/assembly/bin.xml
core/trunk/pom.xml
Log:
[WISE-177] Slim down distribution removing unrequired dependencies
Modified: core/trunk/distribution/main/assembly/bin.xml
===================================================================
--- core/trunk/distribution/main/assembly/bin.xml 2012-07-20 09:54:12 UTC (rev 444)
+++ core/trunk/distribution/main/assembly/bin.xml 2012-07-20 13:18:55 UTC (rev 445)
@@ -23,7 +23,6 @@
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>dir</format>
- <format>tar.gz</format>
<format>zip</format>
</formats>
@@ -65,6 +64,7 @@
<exclude>**/build</exclude>
<exclude>**/build/**/*</exclude>
<exclude>**/.settings</exclude>
+ <exclude>**/.settings/**/*</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
<exclude>**/surefire*</exclude>
@@ -77,22 +77,16 @@
<dependencySet>
<outputDirectory>wise-${wise.version}/lib</outputDirectory>
<unpack>false</unpack>
- <excludes>
- <!--temporarily fixed the jaxws-rt jar problem-->
- <exclude>jaxws-rt*.jar</exclude>
- </excludes>
<scope>runtime</scope>
</dependencySet>
-
<dependencySet>
<outputDirectory>wise-${wise.version}</outputDirectory>
<unpack>false</unpack>
+ <scope>runtime</scope>
<includes>
- <include>wise-*.jar</include>
+ <include>*:wise-core*:jar</include>
</includes>
- <scope>runtime</scope>
</dependencySet>
-
</dependencySets>
</assembly>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2012-07-20 09:54:12 UTC (rev 444)
+++ core/trunk/pom.xml 2012-07-20 13:18:55 UTC (rev 445)
@@ -132,6 +132,12 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
<version>2.0.2.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss.jaxbintros</groupId>
+ <artifactId>jboss-jaxb-intros</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -144,12 +150,52 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
<version>4.0.2.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-management</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-java2ws</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-transports-httpserver</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>gnu-getopt</groupId>
+ <artifactId>getopt</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.milyn</groupId>
<artifactId>milyn-smooks-core</artifactId>
<version>1.2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
12 years, 5 months
wise SVN: r444 - in core/trunk/distribution/main/resouces/samples: interactiveHelloWorld and 1 other directory.
by wise-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-20 05:54:12 -0400 (Fri, 20 Jul 2012)
New Revision: 444
Removed:
core/trunk/distribution/main/resouces/samples/helloWorldJDK6/
core/trunk/distribution/main/resouces/samples/interactiveHelloWorld/build.properties
core/trunk/distribution/main/resouces/samples/interactiveHelloWorldJDK6/
Modified:
core/trunk/distribution/main/resouces/samples/README.txt
Log:
[WISE-177] Further distribution cleanup
Modified: core/trunk/distribution/main/resouces/samples/README.txt
===================================================================
--- core/trunk/distribution/main/resouces/samples/README.txt 2012-07-20 09:43:23 UTC (rev 443)
+++ core/trunk/distribution/main/resouces/samples/README.txt 2012-07-20 09:54:12 UTC (rev 444)
@@ -5,20 +5,19 @@
which kind of test you will find in. Only in case we think an example needs further explanations, you
will find a local README.txt inside its directory.
-lib directory contains library referred by examples. ant directory contains build.xml imported from
+lib directory contains library referred by examples. 'ant' directory contains build.xml imported by
all examples' build.xml.
How to run examples?
-1. Enter in specific example directory ;)
-2. Edit resources/META-INF/jboss-beans.xml and change properties according to your environment (i.e defaultTmpDeployDir) if needed.
+1. Edit ant/sample.properties
+2. Enter in specific example directory
3. Edit resources/META-INF/wise-log4j.xml and change properties according to your environment if needed.
-4. Edit build.properties changing "JBossHome" and "ServerConfig" property to point to your JBossAS instance
-5. Start your JBossAS instance (of course it has to provide JBossWS)
-6. type "ant deployTestWS" to deploy server side content (aka the ws against example will run)
-7. type "ant runTest" to run the client side example
-8. type "ant undeployTestWS" to undeploy server side content
-9. Have a look to the code.
+4. Start your JBoss AS 7 instance
+5. Type "ant deployTestWS" to deploy server side content (an archive shipping the WS endpoint invoked by the sample)
+6. Type "ant runTest" to run the client side example
+7. Type "ant undeployTestWS" to undeploy server side content
+8. Have a look to the code.
If something changes for a specific example you will find instructions on local README.txt
Deleted: core/trunk/distribution/main/resouces/samples/interactiveHelloWorld/build.properties
===================================================================
--- core/trunk/distribution/main/resouces/samples/interactiveHelloWorld/build.properties 2012-07-20 09:43:23 UTC (rev 443)
+++ core/trunk/distribution/main/resouces/samples/interactiveHelloWorld/build.properties 2012-07-20 09:54:12 UTC (rev 444)
@@ -1,3 +0,0 @@
-JBossHome=/dati/jboss-4.2.3.GA/
-ServerConfig=default
-JavaHome=/usr/lib/jvm/java-1.5.0-sun
12 years, 5 months
wise SVN: r443 - in core/trunk/distribution/main/resouces/samples: helloWorldServlet and 1 other directory.
by wise-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-20 05:43:23 -0400 (Fri, 20 Jul 2012)
New Revision: 443
Removed:
core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.properties
Modified:
core/trunk/distribution/main/resouces/samples/ant/build.xml
core/trunk/distribution/main/resouces/samples/helloWorldServlet/README.txt
core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.xml
Log:
[WISE-177] Fixing helloWorldServlet distribution sample
Modified: core/trunk/distribution/main/resouces/samples/ant/build.xml
===================================================================
--- core/trunk/distribution/main/resouces/samples/ant/build.xml 2012-07-20 09:42:01 UTC (rev 442)
+++ core/trunk/distribution/main/resouces/samples/ant/build.xml 2012-07-20 09:43:23 UTC (rev 443)
@@ -98,6 +98,9 @@
<metainf dir="./resources/META-INF">
</metainf>
</jar>
+ </target>
+
+ <target name="war" depends="compile">
<war webxml="./resources/WEB-INF/web.xml" jarfile="${build.server.dir}/${ant.project.name}.war">
<classes dir="${classes.java.server.dir}" />
<webinf dir="./resources/WEB-INF">
@@ -106,11 +109,11 @@
</war>
</target>
- <target name="deployTestWS" depends="jar" description="Deploys the server side archive of the current test">
+ <target name="deployTestWS" depends="war" description="Deploys the server side archive of the current test">
<copy todir="${JBossHome}/${ServerConfig}/deployments/" file="${build.server.dir}/${ant.project.name}.war" />
</target>
- <target name="undeployTestWS" depends="jar" description="Undeploys the server side archive of the current test">
+ <target name="undeployTestWS" description="Undeploys the server side archive of the current test">
<delete file="${JBossHome}/${ServerConfig}/deployments/${ant.project.name}.war"/>
</target>
Modified: core/trunk/distribution/main/resouces/samples/helloWorldServlet/README.txt
===================================================================
--- core/trunk/distribution/main/resouces/samples/helloWorldServlet/README.txt 2012-07-20 09:42:01 UTC (rev 442)
+++ core/trunk/distribution/main/resouces/samples/helloWorldServlet/README.txt 2012-07-20 09:43:23 UTC (rev 443)
@@ -1,13 +1,14 @@
-This example is little different from others since it demonstrate the use of wise in a web application.
+This example is little different from others since it demonstrates the use of Wise in a web application.
-This sample needs a jboss-4.x application server or at least a servlet container.
+This sample needs JBoss Application Server 7.
-To run this sample you have simply to call ant deployTestWS which will deploy a war with the "server side" webservice.
+To run this sample you have simply to call "ant deployTestWS" which will deploy a war with the "server side" webservice.
Then call "ant deployServlet" to deploy a war containing the "client" servlet and all needed libraries. To call the servlet point your browser to
http://localhost:8080/HelloWorld-servlet/HelloWorldServlet?NAME=superman
Then change the name of you preferred super hero ;)
-Please note that Wise client servlet can't stay on the same war of the "server side" webserver due to a conflict in library used by jbossws to provide webservice facilities and ones used to invoke tools.
+You can undeploy the "client" servlet using "ant undeployServlet".
+
Have fun.
Deleted: core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.properties
===================================================================
--- core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.properties 2012-07-20 09:42:01 UTC (rev 442)
+++ core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.properties 2012-07-20 09:43:23 UTC (rev 443)
@@ -1,3 +0,0 @@
-JBossHome=/dati/jboss-4.2.3.GA/
-ServerConfig=default
-JavaHome=/usr/lib/jvm/java-1.5.0-sun
Modified: core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.xml
===================================================================
--- core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.xml 2012-07-20 09:42:01 UTC (rev 442)
+++ core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.xml 2012-07-20 09:43:23 UTC (rev 443)
@@ -6,7 +6,6 @@
<project name="HelloWorld" default="compile" basedir=".">
<property name="server.classes.additional.dir" value="classes/client" />
- <property name="includeWiseInWar" value="true" />
<property file="${basedir}/build.properties" />
@@ -20,18 +19,21 @@
<include name="*"/>
</webinf>
<lib dir="${lib.dir}">
- <include name="commons-io-*.jar" if="includeWiseInWar"/>
- <include name="commons-lang-*.jar" if="includeWiseInWar"/>
- <include name="milyn*.jar" if="includeWiseInWar"/>
- <include name="jaxws-tools*.jar" if="includeWiseInWar"/>
- <include name="*.jar" if="includeWiseInWar"/>
+ <include name="wise-*.jar"/>
+ <include name="milyn-*.jar"/>
</lib>
-
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl optional,org.apache.commons.io,org.apache.commons.lang"/>
+ </manifest>
</war>
</target>
- <target name="deployServlet" depends="servletWar" description="Deploys the server side archive of the current test">
- <copy todir="${JBossHome}/server/${ServerConfig}/deploy/" file="${build.server.dir}/${ant.project.name}-servlet.war" />
+ <target name="deployServlet" depends="servletWar" description="Deploys the client side archive of the current test">
+ <copy todir="${JBossHome}/${ServerConfig}/deployments/" file="${build.server.dir}/${ant.project.name}-servlet.war" />
</target>
+ <target name="undeployServlet" description="Undeploys the client side archive of the current test">
+ <delete file="${JBossHome}/${ServerConfig}/deployments/${ant.project.name}-servlet.war" />
+ </target>
+
</project>
12 years, 5 months
wise SVN: r442 - in core/trunk: core-cxf/src/main/java/org/jboss/wise/core/client and 2 other directories.
by wise-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-20 05:42:01 -0400 (Fri, 20 Jul 2012)
New Revision: 442
Added:
core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/
core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerFactory.java
core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerImpl.java
core/trunk/core-cxf/src/main/resources/META-INF/services/org.jboss.ws.api.tools.ConsumerFactory
Modified:
core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java
Log:
[WISE-179][WISE-180] Workaround for WISE-179, basically forces 2.1 target to prevent issues with in-container compilation of generated sources
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java 2012-07-20 06:12:31 UTC (rev 441)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java 2012-07-20 09:42:01 UTC (rev 442)
@@ -79,6 +79,9 @@
if (catelog != null) {
wsImporter.setCatalog(catelog);
}
+
+ wsImporter.setTarget("2.1"); //workaround for WISE-179
+
runWSConsume(wsImporter, wsdlURL);
return this.getClassNames(outputDir, targetPackage);
}
Added: core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerFactory.java
===================================================================
--- core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerFactory.java (rev 0)
+++ core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerFactory.java 2012-07-20 09:42:01 UTC (rev 442)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wise.core.client.consumer;
+
+import org.jboss.ws.api.tools.WSContractConsumer;
+import org.jboss.ws.api.tools.WSContractConsumerFactory;
+
+/**
+ * A factory for building WiseCXFConsumerImpl; this is basically to consume
+ * the fix for JBWS-3520 which is blocking for Wise 2.0 on AS 7 as it's
+ * the only workaround for WISE-179.
+ *
+ * @author alessio.soldano(a)jboss.com
+ *
+ */
+public class WiseCXFConsumerFactory implements WSContractConsumerFactory
+{
+ public WSContractConsumer createConsumer()
+ {
+ return new WiseCXFConsumerImpl();
+ }
+ }
Added: core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerImpl.java
===================================================================
--- core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerImpl.java (rev 0)
+++ core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerImpl.java 2012-07-20 09:42:01 UTC (rev 442)
@@ -0,0 +1,277 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wise.core.client.consumer;
+
+import java.io.File;
+import java.io.PrintStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ResourceBundle;
+
+import org.apache.cxf.tools.common.ToolContext;
+import org.apache.cxf.tools.wsdlto.WSDLToJava;
+import org.jboss.ws.api.tools.WSContractConsumer;
+import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.common.utils.NullPrintStream;
+import org.jboss.wsf.stack.cxf.tools.CXFConsumerImpl;
+
+/**
+ * A WSContractConsumer for CXF stack; this is basically a copy of the JBossWS-CXF 4.1.0
+ * implementation, to early consume the fix for JBWS-3520 which is blocking for Wise 2.0
+ * on AS 7 as it's the only workaround for WISE-179.
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class WiseCXFConsumerImpl extends WSContractConsumer
+{
+ private static final ResourceBundle bundle = BundleUtils.getBundle(CXFConsumerImpl.class);
+ private List<File> bindingFiles = null;
+ private File catalog = null;
+ private boolean extension;
+ private boolean generateSource = false;
+ private File outputDir = new File("output");
+ private File sourceDir = null;
+ private String targetPackage = null;
+ private PrintStream messageStream = null;
+ private String wsdlLocation = null;
+ private List<String> additionalCompilerClassPath = new ArrayList<String>();
+ private boolean additionalHeaders = false;
+ private String target;
+ private boolean nocompile = false;
+
+ @Override
+ public void setBindingFiles(List<File> bindingFiles)
+ {
+ this.bindingFiles = bindingFiles;
+ }
+
+ @Override
+ public void setCatalog(File catalog)
+ {
+ this.catalog = catalog;
+ }
+
+ @Override
+ public void setExtension(boolean extension)
+ {
+ this.extension = extension;
+ }
+
+ @Override
+ public void setGenerateSource(boolean generateSource)
+ {
+ this.generateSource = generateSource;
+ }
+
+ @Override
+ public void setMessageStream(PrintStream messageStream)
+ {
+ this.messageStream = messageStream;
+ }
+
+ @Override
+ public void setOutputDirectory(File directory)
+ {
+ outputDir = directory;
+ }
+
+ @Override
+ public void setSourceDirectory(File directory)
+ {
+ sourceDir = directory;
+ }
+
+ @Override
+ public void setTargetPackage(String targetPackage)
+ {
+ this.targetPackage = targetPackage;
+ }
+
+ @Override
+ public void setWsdlLocation(String wsdlLocation)
+ {
+ this.wsdlLocation = wsdlLocation;
+ }
+
+ @Override
+ public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath)
+ {
+ this.additionalCompilerClassPath = additionalCompilerClassPath;
+ }
+
+ @Override
+ public void setAdditionalHeaders(boolean additionalHeaders)
+ {
+ this.additionalHeaders = additionalHeaders;
+ }
+
+ @Override
+ public void setTarget(String target)
+ {
+ this.target = target;
+ }
+
+ @Override
+ public void setNoCompile(boolean nocompile)
+ {
+ this.nocompile = nocompile;
+ }
+
+ @Override
+ public void consume(URL wsdl)
+ {
+ List<String> args = new ArrayList<String>();
+
+ PrintStream stream = messageStream;
+ boolean verbose = false;
+ if (stream != null)
+ {
+ verbose = true;
+ }
+ else
+ {
+ stream = NullPrintStream.getInstance();
+ }
+
+ // Always set the target
+ if ("2.1".equals(target))
+ {
+ args.add("-frontend");
+ args.add("jaxws21");
+ }
+ else if (target != null && !target.equals("2.2"))
+ {
+ stream.println("Unsupported target, using default value '2.2'");
+ }
+
+ if (bindingFiles != null)
+ {
+ for (File file : bindingFiles)
+ {
+ args.add("-b");
+ args.add(file.getAbsolutePath());
+
+ }
+ }
+
+ if (catalog != null)
+ {
+ args.add("-catalog");
+ args.add(catalog.getAbsolutePath());
+ }
+
+ if (!nocompile)
+ {
+ args.add("-compile");
+ }
+
+ args.add("-exsh");
+ args.add(additionalHeaders ? "true" : "false");
+
+ if (generateSource && sourceDir == null)
+ {
+ sourceDir = outputDir;
+ }
+
+ if (sourceDir != null && generateSource)
+ {
+ if (!sourceDir.exists() && !sourceDir.mkdirs())
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "COULD_NOT_MAKE_DIRECTORY", sourceDir.getName()));
+
+ args.add("-d");
+ args.add(sourceDir.getAbsolutePath());
+ }
+
+ if (targetPackage != null)
+ {
+ args.add("-p");
+ args.add(targetPackage);
+ }
+
+ if (wsdlLocation != null)
+ {
+ args.add("-wsdlLocation");
+ args.add(wsdlLocation);
+ }
+
+ if (verbose) {
+ args.add("-verbose");
+ }
+
+ if (extension)
+ {
+ stream.println("TODO! Cheek SOAP 1.2 extension");
+ }
+
+ if (!outputDir.exists() && !outputDir.mkdirs())
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "COULD_NOT_MAKE_DIRECTORY", outputDir.getName()));
+
+ // Always add the output directory and the wsdl location
+ if (!nocompile)
+ {
+ args.add("-classdir");
+ args.add(outputDir.getAbsolutePath());
+ }
+ if (nocompile && !generateSource)
+ {
+ args.add("-d");
+ args.add(outputDir.getAbsolutePath());
+ }
+
+ //Always generate wrapped style for reference element:CXF-1079
+ args.add("-allowElementReferences");
+
+ // finally the WSDL file
+ args.add(wsdl.toString());
+
+ // See WsimportTool#compileGeneratedClasses()
+ if (!additionalCompilerClassPath.isEmpty())
+ {
+ StringBuffer javaCP = new StringBuffer();
+ for (String s : additionalCompilerClassPath)
+ {
+ javaCP.append(s).append(File.pathSeparator);
+ }
+ System.setProperty("java.class.path", javaCP.toString());
+ }
+
+
+ WSDLToJava w2j = new WSDLToJava(args.toArray(new String[0]));
+ try
+ {
+ w2j.run(new ToolContext(), stream);
+ }
+ catch (Throwable t)
+ {
+ if (messageStream != null)
+ {
+ messageStream.println("Failed to invoke WSDLToJava");
+ t.printStackTrace(messageStream);
+ }
+ else
+ {
+ t.printStackTrace();
+ }
+ }
+ }
+}
Added: core/trunk/core-cxf/src/main/resources/META-INF/services/org.jboss.ws.api.tools.ConsumerFactory
===================================================================
--- core/trunk/core-cxf/src/main/resources/META-INF/services/org.jboss.ws.api.tools.ConsumerFactory (rev 0)
+++ core/trunk/core-cxf/src/main/resources/META-INF/services/org.jboss.ws.api.tools.ConsumerFactory 2012-07-20 09:42:01 UTC (rev 442)
@@ -0,0 +1 @@
+org.jboss.wise.core.client.consumer.WiseCXFConsumerFactory
\ No newline at end of file
12 years, 5 months
wise SVN: r441 - in core/trunk: distribution and 1 other directory.
by wise-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-20 02:12:31 -0400 (Fri, 20 Jul 2012)
New Revision: 441
Modified:
core/trunk/core/pom.xml
core/trunk/distribution/pom.xml
Log:
[WISE-177] Fixing distribution dependencies
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2012-07-19 17:18:52 UTC (rev 440)
+++ core/trunk/core/pom.xml 2012-07-20 06:12:31 UTC (rev 441)
@@ -117,15 +117,6 @@
<artifactId>hamcrest-all</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.6.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
-
</dependencies>
<build>
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2012-07-19 17:18:52 UTC (rev 440)
+++ core/trunk/distribution/pom.xml 2012-07-20 06:12:31 UTC (rev 441)
@@ -15,18 +15,22 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <properties>
+ <wise.version>${project.version}</wise.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-core-cxf</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ </dependency>
</dependencies>
- <properties>
- <wise.version>${project.version}</wise.version>
- </properties>
-
<build>
<plugins>
<plugin>
12 years, 5 months
wise SVN: r440 - core/trunk/core-cxf.
by wise-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-19 13:18:52 -0400 (Thu, 19 Jul 2012)
New Revision: 440
Modified:
core/trunk/core-cxf/pom.xml
Log:
[WISE-177] Removing unrequired dependency
Modified: core/trunk/core-cxf/pom.xml
===================================================================
--- core/trunk/core-cxf/pom.xml 2012-07-19 17:17:03 UTC (rev 439)
+++ core/trunk/core-cxf/pom.xml 2012-07-19 17:18:52 UTC (rev 440)
@@ -104,14 +104,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
-
</dependencies>
<build>
12 years, 5 months
wise SVN: r439 - core/trunk.
by wise-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-19 13:17:03 -0400 (Thu, 19 Jul 2012)
New Revision: 439
Modified:
core/trunk/pom.xml
Log:
[WISE-177] cxf-rt-trasnports-http is required with compile scope, not test
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2012-07-19 17:15:56 UTC (rev 438)
+++ core/trunk/pom.xml 2012-07-19 17:17:03 UTC (rev 439)
@@ -222,7 +222,6 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
12 years, 5 months
wise SVN: r438 - core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws.
by wise-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-19 13:15:56 -0400 (Thu, 19 Jul 2012)
New Revision: 438
Modified:
core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java
Log:
[WISE-177] Removing hack not required anymore
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java 2012-07-19 17:15:10 UTC (rev 437)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java 2012-07-19 17:15:56 UTC (rev 438)
@@ -26,12 +26,10 @@
import java.net.MalformedURLException;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.util.LinkedList;
import java.util.List;
import net.jcip.annotations.ThreadSafe;
-import org.apache.log4j.Logger;
import org.jboss.wise.core.consumer.WSConsumer;
import org.jboss.wise.core.exception.WiseRuntimeException;
import org.jboss.ws.api.tools.WSContractConsumer;
@@ -44,11 +42,6 @@
@ThreadSafe
public class DefaultWSImportImpl extends WSConsumer {
- private final String[] neededClasses = { "javax/jws/WebResult.class",
- "javax/xml/ws/Action.class",
- "javax/xml/bind/JAXBElement.class",
- "com/sun/xml/bind/XmlAccessorFactory.class" };
-
public DefaultWSImportImpl() {
}
@@ -79,8 +72,6 @@
wsImporter.setMessageStream(messageStream);
}
- wsImporter.setAdditionalCompilerClassPath(defineAdditionalCompilerClassPath());
-
if (bindingFiles != null && bindingFiles.size() > 0) {
wsImporter.setBindingFiles(bindingFiles);
}
@@ -96,25 +87,6 @@
wsImporter.consume(wsdlURL);
}
- /*
- * This is used load libraries required by tests and usually not available
- * when running out of container.
- *
- * @return A list of paths
- */
- protected List<String> defineAdditionalCompilerClassPath() throws WiseRuntimeException {
- List<String> cp = new LinkedList<String>();
- for (String jar : neededClasses) {
- try {
- cp.add(getContextClassLoader().getResource(jar).getPath().split("!")[0]);
- } catch (NullPointerException npe) {
- Logger.getLogger(this.getClass()).debug("Did not find jar needed by wsImport API:" + jar);
- }
-
- }
- return cp;
- }
-
private static ClassLoader getContextClassLoader()
{
SecurityManager sm = System.getSecurityManager();
12 years, 5 months
wise SVN: r437 - in core/trunk/distribution: main/resouces/samples/ant and 1 other directory.
by wise-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-19 13:15:10 -0400 (Thu, 19 Jul 2012)
New Revision: 437
Modified:
core/trunk/distribution/main/resouces/samples/ant/build.xml
core/trunk/distribution/main/resouces/samples/ant/sample.properties
core/trunk/distribution/pom.xml
Log:
[WISE-177] Initial cleanup of distribution module
Modified: core/trunk/distribution/main/resouces/samples/ant/build.xml
===================================================================
--- core/trunk/distribution/main/resouces/samples/ant/build.xml 2012-07-19 17:14:19 UTC (rev 436)
+++ core/trunk/distribution/main/resouces/samples/ant/build.xml 2012-07-19 17:15:10 UTC (rev 437)
@@ -19,9 +19,8 @@
<property name="classes.java.server.dir" value="classes/server" />
<property name="server.classes.additional.dir" value="classes" />
<property name="lib.dir" value="../../lib" />
- <property name="local.lib.dir" value="./lib" />
<property name="distribuion.dir" value="../../" />
- <property file="${basedir}/../ant/sample.properties" />
+ <property file="${basedir}/../ant/sample.properties" />
<!-- Use -Ddebug=true for remote debugging -->
<condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005">
@@ -43,9 +42,6 @@
<fileset dir="${lib.dir}">
<include name="*.jar" />
</fileset>
- <fileset dir="${local.lib.dir}">
- <include name="*.jar" />
- </fileset>
<fileset dir="${distribuion.dir}">
<include name="*.jar" />
</fileset>
@@ -55,18 +51,14 @@
<fileset dir="${lib.dir}">
<include name="*.jar" />
</fileset>
- <fileset dir="${local.lib.dir}">
+ <fileset dir="${distribuion.dir}">
<include name="*.jar" />
</fileset>
- <fileset dir="${distribuion.dir}">
- <include name="*.jar" />
- </fileset>
<fileset dir="${build.client.dir}">
<include name="*.jar" />
</fileset>
- <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/>
+ <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/>
<!--<path refid="additional.run.classpath"/>-->
-
</path>
<target name="clean">
@@ -75,8 +67,8 @@
<delete dir="${classes.dir}" />
<delete dir="${build.client.dir}" />
<delete dir="${build.server.dir}" />
- <delete dir="${build.dir}" />
- <delete dir="${log.dir}" />
+ <delete dir="${build.dir}" />
+ <delete dir="${log.dir}" />
</target>
<target name="prepare">
@@ -86,10 +78,10 @@
<mkdir dir="${build.server.dir}" />
</target>
<target name="compile" description="Compile the Java source code" depends="prepare">
- <javac destdir="${classes.java.client.dir}" classpathref="build.classpath" debug="true" deprecation="true" target="1.5">
+ <javac destdir="${classes.java.client.dir}" classpathref="build.classpath" debug="true" deprecation="true" target="1.6">
<src path="${src.java.client.dir}" />
</javac>
- <javac destdir="${classes.java.server.dir}" classpathref="build.classpath" debug="true" deprecation="true" target="1.5">
+ <javac destdir="${classes.java.server.dir}" classpathref="build.classpath" debug="true" deprecation="true" target="1.6">
<src path="${src.java.server.dir}" />
</javac>
<copy todir="${classes.java.client.dir}">
@@ -107,7 +99,7 @@
</metainf>
</jar>
<war webxml="./resources/WEB-INF/web.xml" jarfile="${build.server.dir}/${ant.project.name}.war">
- <fileset dir="${classes.java.server.dir}" />
+ <classes dir="${classes.java.server.dir}" />
<webinf dir="./resources/WEB-INF">
<include name="*"/>
</webinf>
@@ -115,11 +107,11 @@
</target>
<target name="deployTestWS" depends="jar" description="Deploys the server side archive of the current test">
- <copy todir="${JBossHome}/server/${ServerConfig}/deploy/" file="${build.server.dir}/${ant.project.name}.war" />
+ <copy todir="${JBossHome}/${ServerConfig}/deployments/" file="${build.server.dir}/${ant.project.name}.war" />
</target>
<target name="undeployTestWS" depends="jar" description="Undeploys the server side archive of the current test">
- <delete file="${JBossHome}/server/${ServerConfig}/deploy/${ant.project.name}.war"/>
+ <delete file="${JBossHome}/${ServerConfig}/deployments/${ant.project.name}.war"/>
</target>
<target name="runTest" depends="jar" description="Run the current test">
Modified: core/trunk/distribution/main/resouces/samples/ant/sample.properties
===================================================================
--- core/trunk/distribution/main/resouces/samples/ant/sample.properties 2012-07-19 17:14:19 UTC (rev 436)
+++ core/trunk/distribution/main/resouces/samples/ant/sample.properties 2012-07-19 17:15:10 UTC (rev 437)
@@ -1,2 +1,2 @@
-JBossHome=/dati/jboss-4.2.3.GA
-ServerConfig=default
+JBossHome=/dati/jboss-as-7.1.1.Final
+ServerConfig=standalone
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2012-07-19 17:14:19 UTC (rev 436)
+++ core/trunk/distribution/pom.xml 2012-07-19 17:15:10 UTC (rev 437)
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.wise</groupId>
- <artifactId>wise-core</artifactId>
+ <artifactId>wise-core-cxf</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
12 years, 5 months