Author: kstam
Date: Sat Apr 27 18:59:23 2013
New Revision: 1476659
URL: http://svn.apache.org/r1476659
Log:
JUDDI-546, adding a endorsed library for tomcat with the jaxws-2.2 jar
Modified:
juddi/trunk/juddi-tomcat/build.xml
juddi/trunk/juddi-tomcat/pom.xml
Modified: juddi/trunk/juddi-tomcat/build.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/build.xml?rev=1476659&r1=1476658&r2=1476659&view=diff
==============================================================================
--- juddi/trunk/juddi-tomcat/build.xml (original)
+++ juddi/trunk/juddi-tomcat/build.xml Sat Apr 27 18:59:23 2013
@@ -3,6 +3,7 @@
<property name="lib.dir"
value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/lib"/>
<property name="webapps.dir"
value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps"/>
<property name="conf.dir"
value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/conf"/>
+ <property name="endorsed.dir"
value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/endorsed"/>
<target name="unzip-tomcat">
<mkdir dir="${basedir}/target/tomcat"/>
@@ -13,29 +14,13 @@
<target name="copy-resources" depends="unzip-tomcat">
<copy file="${basedir}/catalina.sh"
todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin"
overwrite="true"/>
<copy file="${basedir}/context.xml"
todir="${webapps.dir}/juddiv3/META-INF" overwrite="true"/>
- <!--
- <copy file="${basedir}/context.xml"
todir="${webapps.dir}/juddiv3-samples/META-INF"/>
- -->
<copy file="${basedir}/server.xml" todir="${conf.dir}"
overwrite="true"/>
<copy file="${dependency.mysql.jar}" todir="${lib.dir}"/>
<copy file="${dependency.postgres.jar}" todir="${lib.dir}"/>
<copy file="${dependency.log4j.jar}" todir="${lib.dir}"/>
<copy file="${dependency.derby.jar}" todir="${lib.dir}"/>
<copy file="${dependency.commons-discovery.jar}"
todir="${lib.dir}"/>
- <!--
- <replace
file="${webapps.dir}/juddiv3/WEB-INF/juddiv3.properties">
- <replacetoken>juddi-sql/mysql</replacetoken>
- <replacevalue>juddi-sql/derby</replacevalue>
- </replace>
- <replace
file="${webapps.dir}/juddiv3/WEB-INF/juddiv3.properties">
-
<replacetoken>#juddi.jdbcUrl=jdbc:mysql://localhost/juddi</replacetoken>
-
<replacevalue>juddi.jdbcUrl=jdbc:derby:juddi-derby-test-db;create=true</replacevalue>
- </replace>
- <replace
file="${webapps.dir}/juddiv3/WEB-INF/juddiv3.properties">
-
<replacetoken>#juddi.jdbcDriver=com.mysql.jdbc.Driver</replacetoken>
-
<replacevalue>juddi.jdbcDriver=org.apache.derby.jdbc.EmbeddedDriver</replacevalue>
- </replace>
- -->
+ <copy file="${dependency.jaxws.jar}" todir="${endorsed.dir}"/>
</target>
<target name="package-tomcat" depends="copy-resources">
Modified: juddi/trunk/juddi-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/pom.xml?rev=1476659&r1=1476658&r2=1476659&view=diff
==============================================================================
--- juddi/trunk/juddi-tomcat/pom.xml (original)
+++ juddi/trunk/juddi-tomcat/pom.xml Sat Apr 27 18:59:23 2013
@@ -54,6 +54,12 @@
<version>5.1.6</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>8.2-504.jdbc3</version>
@@ -94,6 +100,7 @@
<property
name="dependency.derby.jar"
value="${maven.dependency.org.apache.derby.derby.jar.path}" />
<property
name="dependency.tomcat.zip"
value="${maven.dependency.org.apache.juddi.bootstrap.apache-tomcat.zip.path}" />
<property
name="dependency.juddiv3.war"
value="${basedir}/../juddiv3-war/target/juddiv3.war" />
+ <property
name="dependency.jaxws.jar"
value="${maven.dependency.org.apache.geronimo.specs.geronimo-jaxws_2.2_spec.jar.path}"
/>
<ant
antfile="${basedir}/build.xml">
<property name="dependency.tomcat.zip" value="${dependency.tomcat.zip}" />
<target
name="package-tomcat" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
