[jboss-svn-commits] JBL Code SVN: r37254 - in labs/jbossesb/branches/JBESB_4_10_CP/product: install and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 11 17:10:09 EDT 2011
Author: tcunning
Date: 2011-07-11 17:10:09 -0400 (Mon, 11 Jul 2011)
New Revision: 37254
Removed:
labs/jbossesb/branches/JBESB_4_10_CP/product/lib/ext/juddiv3-3.1.0.war
Modified:
labs/jbossesb/branches/JBESB_4_10_CP/product/install/build.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/build.xml
labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/war/resources/WEB-INF/web.xml
Log:
JBESB-3625
Grab the released juddiv3.war, remove the examples, add a custom web.xml.
Remove the juddiv3 WAR checked into lib/ext.
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/install/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/install/build.xml 2011-07-11 17:46:11 UTC (rev 37253)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/install/build.xml 2011-07-11 21:10:09 UTC (rev 37254)
@@ -348,7 +348,7 @@
</copy>
<copy todir="${deploy.dir}"
- file="${org.jboss.esb.dist.lib}/juddiv3.war"/>
+ file="${product.dir}/build/juddiv3.war"/>
<copy tofile="${deploy.dir}/jbossesb.sar/META-INF/jboss-service.xml" file="${basedir}/jboss-service-jbossas5.xml" overwrite="true"/>
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml 2011-07-11 17:46:11 UTC (rev 37253)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/ivy.xml 2011-07-11 21:10:09 UTC (rev 37254)
@@ -46,6 +46,9 @@
<dependency org="org.jboss.client" name="jbossall-client" rev="4.2.3.GA"/>
<dependency org="com.jcraft" name="jsch" rev="0.1.38"/>
+ <dependency org="org.apache.juddi" name="juddiv3-war" rev="3.1.0">
+ <artifact name="juddiv3-war" type="war"/>
+ </dependency>
<dependency org="org.apache.juddi" name="uddi-ws" rev="3.1.0"/>
<dependency org="org.apache.juddi" name="juddi-client" rev="3.1.0"/>
<dependency org="org.apache.juddi" name="juddi-core" rev="3.1.0"/>
Deleted: labs/jbossesb/branches/JBESB_4_10_CP/product/lib/ext/juddiv3-3.1.0.war
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/build.xml 2011-07-11 17:46:11 UTC (rev 37253)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/build.xml 2011-07-11 21:10:09 UTC (rev 37254)
@@ -8,7 +8,7 @@
<property name="org.jboss.esb.rosetta.classes.dir" location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
<property name="uddi.webservices.jar" value="uddi-ws-3.1.0.jar"/>
- <property name="juddi.v3.war" value="juddiv3-3.1.0.war"/>
+ <property name="juddi.v3.war" value="juddiv3-war-3.1.0.war"/>
<property name="juddi.v3.wsdl.location" value="org/jboss/internal/soa/esb/registry/client/wsdl"/>
<property name="juddi.v3.wsdl.dir" location="juddiv3.wsdl"/>
@@ -340,8 +340,11 @@
<delete file="${juddiv3.war.file}" quiet="true"/>
<zip destfile="${juddiv3.war.file}">
<zipfileset dir="${org.jboss.esb.registry.war.resources.dir}/WEB-INF"
- includes="jboss-web.xml" fullpath="WEB-INF/jboss-web.xml"/>
- <zipfileset src="${org.jboss.esb.ext.lib.dir}/${juddi.v3.war}"/>
+ includes="jboss-web.xml" fullpath="WEB-INF/jboss-web.xml"/>
+ <zipfileset dir="${org.jboss.esb.registry.war.resources.dir}/WEB-INF"
+ includes="web.xml" fullpath="WEB-INF/web.xml"/>
+ <zipfileset src="${org.jboss.esb.lib.dir}/${juddi.v3.war}"
+ includes="META-INF/**, WEB-INF/classes/**/NotifyServlet.class, index.jsp, juddi.css"/>
</zip>
<!--
@@ -355,6 +358,6 @@
</zip>
-->
- <copy file="${org.jboss.esb.ext.lib.dir}/${juddi.v3.war}" todir="${org.jboss.esb.rosetta.distrib.dir}/lib"/>
+ <copy file="${juddiv3.war.file}" todir="${org.jboss.esb.internal.dest}"/>
</target>
</project>
Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/war/resources/WEB-INF/web.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/war/resources/WEB-INF/web.xml 2011-07-11 17:46:11 UTC (rev 37253)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/rosetta/war/resources/WEB-INF/web.xml 2011-07-11 21:10:09 UTC (rev 37254)
@@ -6,59 +6,59 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<servlet>
<servlet-name>CustodyTransferService</servlet-name>
- <servlet-class>org.jboss.internal.soa.esb.registry.webservices.CustodyTransferService</servlet-class>
+ <servlet-class>org.apache.juddi.api.impl.UDDICustodyTransferImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>InquiryService</servlet-name>
- <servlet-class>org.jboss.internal.soa.esb.registry.webservices.InquiryService</servlet-class>
+ <servlet-class>org.apache.juddi.api.impl.UDDIInquiryImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>PublicationService</servlet-name>
- <servlet-class>org.jboss.internal.soa.esb.registry.webservices.PublicationService</servlet-class>
+ <servlet-class>org.apache.juddi.api.impl.UDDIPublicationImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>ReplicationService</servlet-name>
- <servlet-class>org.jboss.internal.soa.esb.registry.webservices.ReplicationService</servlet-class>
+ <servlet-class>org.apache.juddi.api.impl.UDDIReplicationImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>SecurityService</servlet-name>
- <servlet-class>org.jboss.internal.soa.esb.registry.webservices.SecurityService</servlet-class>
+ <servlet-class>org.apache.juddi.api.impl.UDDISecurityImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>SubscriptionService</servlet-name>
- <servlet-class>org.jboss.internal.soa.esb.registry.webservices.SubscriptionService</servlet-class>
+ <servlet-class>org.apache.juddi.api.impl.UDDISecurityImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>SubscriptionListenerService</servlet-name>
- <servlet-class>org.jboss.internal.soa.esb.registry.webservices.SubscriptionListenerService</servlet-class>
+ <servlet-class>org.apache.juddi.api.impl.UDDISubscriptionImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>ValueSetCachingService</servlet-name>
- <servlet-class>org.jboss.internal.soa.esb.registry.webservices.ValueSetCachingService</servlet-class>
+ <servlet-class>org.apache.juddi.api.impl.UDDIValueSetCachingImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>ValueSetValidationService</servlet-name>
- <servlet-class>org.jboss.internal.soa.esb.registry.webservices.ValueSetValidationService</servlet-class>
+ <servlet-class>org.apache.juddi.api.impl.ValueSetValidationImpl.java</servlet-class>
</servlet>
<servlet>
<servlet-name>JUDDIApiService</servlet-name>
- <servlet-class>org.jboss.internal.soa.esb.registry.webservices.JUDDIApiService</servlet-class>
+ <servlet-class>org.apache.juddi.api.impl.JUDDIApiImpl</servlet-class>
</servlet>
<servlet>
- <servlet-name>NotifyServlet</servlet-name>
- <servlet-class>org.apache.juddi.servlets.NotifyServlet</servlet-class>
+ <servlet-name>NotifyServlet</servlet-name>
+ <servlet-class>org.apache.juddi.servlets.NotifyServlet</servlet-class>
</servlet>
-
+
<servlet-mapping>
<servlet-name>CustodyTransferService</servlet-name>
<url-pattern>/services/custody-transfer</url-pattern>
@@ -113,4 +113,9 @@
<servlet-name>NotifyServlet</servlet-name>
<url-pattern>/notify/*</url-pattern>
</servlet-mapping>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
</web-app>
More information about the jboss-svn-commits
mailing list