You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2009/03/21 20:11:10 UTC

svn commit: r756991 - in /webservices/juddi/branches/v3_trunk: ./ juddi-axis/src/main/webapp/ juddi-console/juddi-portal/ juddi-console/uddi-portlets/ juddi-console/uddi-portlets/src/main/webapp/images/ juddi-cxf/src/main/webapp/ juddi-tomcat/ uddi-cli...

Author: kstam
Date: Sat Mar 21 19:11:10 2009
New Revision: 756991

URL: http://svn.apache.org/viewvc?rev=756991&view=rev
Log:
JUDDI-199 - Creating a jUDDI console, which is a Pluto based portal.

Added:
    webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/
    webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/README
    webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/assembly.xml
    webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/build.xml
    webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/package.properties
    webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pluto-portal-driver-config.xml
    webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pluto.xml
    webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pom.xml
    webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/tomcat-users.xml
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/src/main/webapp/images/
Modified:
    webservices/juddi/branches/v3_trunk/juddi-axis/src/main/webapp/index.jsp
    webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/pom.xml
    webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/index.jsp
    webservices/juddi/branches/v3_trunk/juddi-tomcat/assembly.xml
    webservices/juddi/branches/v3_trunk/juddi-tomcat/build.xml
    webservices/juddi/branches/v3_trunk/pom.xml
    webservices/juddi/branches/v3_trunk/uddi-client/pom.xml

Modified: webservices/juddi/branches/v3_trunk/juddi-axis/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-axis/src/main/webapp/index.jsp?rev=756991&r1=756990&r2=756991&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-axis/src/main/webapp/index.jsp (original)
+++ webservices/juddi/branches/v3_trunk/juddi-axis/src/main/webapp/index.jsp Sat Mar 21 19:11:10 2009
@@ -45,6 +45,7 @@
 
 <h3><em>Welcome</em> to Apache jUDDI!</h3>
 <ul>
+    <li><a href="/pluto/portal/jUDDI">jUDDI Portlets</a></li>
     <li><a href="services">View</a> service listing</li>
     <li><a href="http://ws.apache.org/juddi/">Visit</a> the Apache-jUDDI Home Page</li>
 </ul>

Added: webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/README
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/README?rev=756991&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/README (added)
+++ webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/README Sat Mar 21 19:11:10 2009
@@ -0,0 +1,12 @@
+Please use maven-2.0.6 (2.0.8 also seems to work) when building, 
+juddi-tomcat uses dependency properties which are broken in recent versions of maven.
+
+You will see an error like:
+
+Caused by: java.io.FileNotFoundException: 
+C:\development\projects\jUDDI_v3\juddi-tomcat\${maven.dependency.tomcat.apache-tomcat.zip.path} 
+(The system cannot find the file specified)
+
+where the ${maven.dependency.tomcat.apache-tomcat.zip.path} should have been set by maven.
+
+

Added: webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/assembly.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/assembly.xml?rev=756991&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/assembly.xml (added)
+++ webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/assembly.xml Sat Mar 21 19:11:10 2009
@@ -0,0 +1,12 @@
+<assembly>
+  <id></id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+	  <directory>${project.build.directory}/tomcat/juddi-tomcat-3.0.0.SNAPSHOT</directory>
+	  <outputDirectory></outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>

Added: webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/build.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/build.xml?rev=756991&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/build.xml (added)
+++ webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/build.xml Sat Mar 21 19:11:10 2009
@@ -0,0 +1,33 @@
+<project name="juddi-portal.tomcat" default="package-tomcat" basedir=".">
+	<property file="package.properties"/>
+	<property name="shared.lib.dir" value="${basedir}/target/tomcat/juddi-tomcat-${juddi.tomcat.version}/shared/lib"/>
+	<property name="conf.dir" value="${basedir}/target/tomcat/juddi-tomcat-${juddi.tomcat.version}/conf"/>
+	<property name="webapps.dir" value="${basedir}/target/tomcat/juddi-tomcat-${juddi.tomcat.version}/webapps"/>
+
+	<target name="unzip-tomcat">
+		<mkdir dir="${basedir}/target/tomcat"/>
+
+		<unzip dest="${basedir}/target/tomcat" src="${dependency.juddi-tomcat.zip}"/>
+		<copy file="${basedir}/tomcat-users.xml" todir="${conf.dir}"/>
+		<copy file="${basedir}/pluto.xml" todir="${conf.dir}/Catalina/localhost"/>
+		<unzip dest="${webapps.dir}/pluto" src="${dependency.pluto-portal.war}"/>
+		<unzip dest="${webapps.dir}/uddi-portlets" src="${dependency.uddi-portlets.war}"/>
+		<copy file="${basedir}/pluto-portal-driver-config.xml" todir="${webapps.dir}/pluto/WEB-INF"/>
+		<chmod perm="ugo+x">
+			<fileset dir="${basedir}/target/tomcat/juddi-tomcat-${juddi.tomcat.version}/bin">
+				<include name="*.sh"/>
+			</fileset>
+		</chmod>
+	</target>
+	
+	<target name="copy-resources" depends="unzip-tomcat">
+		<copy file="${dependency.castor.jar}" todir="${shared.lib.dir}"/>
+		<copy file="${dependency.pluto-container.jar}" todir="${shared.lib.dir}"/>
+		<copy file="${dependency.pluto-descriptor-api.jar}" todir="${shared.lib.dir}"/>
+		<copy file="${dependency.pluto-descriptor-impl.jar}" todir="${shared.lib.dir}"/>
+		<copy file="${dependency.pluto-taglib.jar}" todir="${shared.lib.dir}"/>
+		<copy file="${dependency.portlet-api.jar}" todir="${shared.lib.dir}"/>
+	</target>
+	
+	<target name="package-tomcat" depends="copy-resources"/>
+</project>

Added: webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/package.properties
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/package.properties?rev=756991&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/package.properties (added)
+++ webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/package.properties Sat Mar 21 19:11:10 2009
@@ -0,0 +1 @@
+juddi.tomcat.version=3.0.0.SNAPSHOT

Added: webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pluto-portal-driver-config.xml?rev=756991&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pluto-portal-driver-config.xml (added)
+++ webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pluto-portal-driver-config.xml Sat Mar 21 19:11:10 2009
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+-->
+
+<pluto-portal-driver
+    xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd
+                        http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd"
+    version="1.1">
+
+  <portal-name>pluto-portal-driver</portal-name>
+  <portal-version>1.1.7</portal-version>
+  <container-name>Pluto Portal Driver</container-name>
+
+  <supports>
+    <portlet-mode>view</portlet-mode>
+    <portlet-mode>edit</portlet-mode>
+    <portlet-mode>help</portlet-mode>
+    <portlet-mode>config</portlet-mode>
+
+    <window-state>normal</window-state>
+    <window-state>maximized</window-state>
+    <window-state>minimized</window-state>
+  </supports>
+
+
+  <!-- Render configuration which defines the portal pages. -->
+  <render-config default="About Apache Pluto">
+    <page name="jUDDI" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/uddi-portlets" name="UDDIBrowserPortlet"/>
+    </page>
+    <page name="Pluto Admin" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/pluto" name="PlutoPageAdmin"/>
+      <portlet context="/pluto" name="AboutPortlet"/>
+    </page>
+    <page name="About Apache Pluto" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/pluto" name="AboutPortlet"/>
+    </page>
+  </render-config>
+
+</pluto-portal-driver>

Added: webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pluto.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pluto.xml?rev=756991&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pluto.xml (added)
+++ webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pluto.xml Sat Mar 21 19:11:10 2009
@@ -0,0 +1 @@
+<Context path="pluto" crossContext="true"></Context>
\ No newline at end of file

Added: webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pom.xml?rev=756991&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pom.xml (added)
+++ webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/pom.xml Sat Mar 21 19:11:10 2009
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 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.
+ *
+ */ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.juddi</groupId>
+    <artifactId>juddi-parent</artifactId>
+    <version>3.0.0.SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion> 
+  <groupId>org.apache.juddi</groupId>
+  <artifactId>juddi-portal-bundle</artifactId>
+  <version>3.0.0.SNAPSHOT</version>
+  <name>jUDDI Console</name>
+  <url>http://maven.apache.org</url>
+  <packaging>pom</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.juddi</groupId>
+      <artifactId>juddi-tomcat</artifactId>
+      <version>3.0.0.SNAPSHOT</version> 
+      <type>zip</type>
+    </dependency>
+    <dependency>
+	    <groupId>org.apache.juddi</groupId>
+	    <artifactId>uddi-portlets</artifactId>
+	    <version>3.0.0-SNAPSHOT</version>
+	    <type>war</type>
+     </dependency>
+    <dependency>
+	    <groupId>org.apache.pluto</groupId>
+	    <artifactId>pluto-portal</artifactId>
+	    <version>1.1.7</version>
+	    <type>war</type>
+     </dependency>
+     <dependency>
+	    <groupId>org.apache.pluto</groupId>
+	    <artifactId>pluto-container</artifactId>
+	    <version>1.1.7</version>
+	    <type>jar</type>
+     </dependency>
+     <dependency>
+	    <groupId>org.apache.pluto</groupId>
+	    <artifactId>pluto-descriptor-api</artifactId>
+	    <version>1.1.7</version>
+	    <type>jar</type>
+     </dependency>
+     <dependency>
+	    <groupId>org.apache.pluto</groupId>
+	    <artifactId>pluto-descriptor-impl</artifactId>
+	    <version>1.1.7</version>
+	    <type>jar</type>
+     </dependency>
+     <dependency>
+	    <groupId>org.apache.pluto</groupId>
+	    <artifactId>pluto-taglib</artifactId>
+	    <version>1.1.7</version>
+	    <type>jar</type>
+     </dependency>
+     <dependency>
+	    <groupId>org.apache.pluto</groupId>
+	    <artifactId>pluto-container</artifactId>
+	    <version>1.1.7</version>
+	    <type>jar</type>
+     </dependency>
+     <dependency>
+      <groupId>javax.portlet</groupId>
+      <artifactId>portlet-api</artifactId>
+      <version>1.0</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.castor</groupId>
+      <artifactId>castor</artifactId>
+      <version>1.1.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.transaction</groupId>
+          <artifactId>jta</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xerces</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    
+     
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <version>2.1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.3</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>package</phase>
+            <configuration>
+              <tasks>
+               <property name="compile_classpath" refid="maven.compile.classpath"/>
+               <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+               <property name="test_classpath"    refid="maven.test.classpath"/>
+               <property name="plugin_classpath"  refid="maven.plugin.classpath"/>
+               <property name="project.version"       value="${project.version}"/>
+		       <property name="dependency.castor.jar"  value="${maven.dependency.org.codehaus.castor.castor.jar.path}"/>
+		       <property name="dependency.pluto-container.jar"  value="${maven.dependency.org.apache.pluto.pluto-container.jar.path}"/>
+		       <property name="dependency.pluto-descriptor-api.jar" value="${maven.dependency.org.apache.pluto.pluto-descriptor-api.jar.path}"/>
+		       <property name="dependency.pluto-descriptor-impl.jar"  value="${maven.dependency.org.apache.pluto.pluto-descriptor-impl.jar.path}"/>
+		       <property name="dependency.pluto-taglib.jar"  value="${maven.dependency.org.apache.pluto.pluto-taglib.jar.path}"/>
+		       <property name="dependency.pluto-portal.war"  value="${maven.dependency.org.apache.pluto.pluto-portal.war.path}"/>
+		       <property name="dependency.portlet-api.jar"  value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
+		       <property name="dependency.uddi-portlets.war"  value="${maven.dependency.org.apache.juddi.uddi-portlets.war.path}"/>
+		       <property name="dependency.juddi-tomcat.zip" value="${maven.dependency.org.apache.juddi.juddi-tomcat.zip.path}"/>
+		       <ant antfile="${basedir}/build.xml">
+                  <target name="package-tomcat"/>
+               </ant>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+     
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+	  <artifactId>maven-assembly-plugin</artifactId>
+	  <version>2.2-beta-3</version>
+	  <executions>
+	  <execution>
+          <id>make-assembly</id>
+          <phase>package</phase>
+          <goals>
+              <goal>attached</goal>
+          </goals>
+	  <configuration>
+	  <descriptors>
+	    <descriptor>${basedir}/assembly.xml</descriptor>
+	  </descriptors>
+	  </configuration>
+	  </execution>
+          </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/tomcat-users.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/tomcat-users.xml?rev=756991&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/tomcat-users.xml (added)
+++ webservices/juddi/branches/v3_trunk/juddi-console/juddi-portal/tomcat-users.xml Sat Mar 21 19:11:10 2009
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='utf-8'?>
+<tomcat-users>
+  <role rolename="pluto"/>
+  <role rolename="tomcat"/>
+  <role rolename="role1"/>
+  <role rolename="manager"/>
+  <user username="pluto" password="pluto" roles="pluto,tomcat,manager"/>
+  <user username="tomcat" password="tomcat" roles="tomcat,pluto,manager"/>
+  <user username="role1" password="tomcat" roles="role1"/>
+  <user username="both" password="tomcat" roles="tomcat,role1"/>
+</tomcat-users>

Modified: webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/pom.xml?rev=756991&r1=756990&r2=756991&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-console/uddi-portlets/pom.xml Sat Mar 21 19:11:10 2009
@@ -127,6 +127,13 @@
 	</dependencies>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<webXml>target/web.xml</webXml>
+				</configuration>
+			</plugin>
 		    <!--  configure the GWT-Maven plugin -->
 			<plugin>
 				<groupId>com.totsp.gwt</groupId>

Modified: webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/index.jsp?rev=756991&r1=756990&r2=756991&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/index.jsp (original)
+++ webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/index.jsp Sat Mar 21 19:11:10 2009
@@ -45,6 +45,7 @@
 
 <h3><em>Welcome</em> to Apache jUDDI!</h3>
 <ul>
+    <li><a href="/pluto/portal/jUDDI">jUDDI Portlets</a></li>
     <li><a href="services">View</a> service listing</li>
     <li><a href="http://ws.apache.org/juddi/">Visit</a> the Apache-jUDDI Home Page</li>
 </ul>

Modified: webservices/juddi/branches/v3_trunk/juddi-tomcat/assembly.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-tomcat/assembly.xml?rev=756991&r1=756990&r2=756991&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-tomcat/assembly.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-tomcat/assembly.xml Sat Mar 21 19:11:10 2009
@@ -6,7 +6,7 @@
   <fileSets>
     <fileSet>
 	  <directory>${project.build.directory}/tomcat/apache-tomcat-5.5.23</directory>
-	  <outputDirectory>apache-tomcat-5.5.23</outputDirectory>
+	  <outputDirectory></outputDirectory>
     </fileSet>
   </fileSets>
 </assembly>

Modified: webservices/juddi/branches/v3_trunk/juddi-tomcat/build.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-tomcat/build.xml?rev=756991&r1=756990&r2=756991&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-tomcat/build.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-tomcat/build.xml Sat Mar 21 19:11:10 2009
@@ -37,9 +37,6 @@
 		-->
 	</target>
 	
-	<target name="package-tomcat" depends="copy-resources">
-<!--		<zip destfile="target/juddi-tomcat-bundle.zip" 
-			basedir="target/tomcat"/>
--->			
-	</target>
+	<target name="package-tomcat" depends="copy-resources"/>
+
 </project>

Modified: webservices/juddi/branches/v3_trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/pom.xml?rev=756991&r1=756990&r2=756991&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/pom.xml Sat Mar 21 19:11:10 2009
@@ -138,6 +138,7 @@
     <module>juddi-tomcat</module>
     <module>uddi-client</module>
     <module>juddi-console/uddi-portlets</module>
+    <module>juddi-console/juddi-portal</module>
   </modules>
   <distributionManagement>
     <repository>

Modified: webservices/juddi/branches/v3_trunk/uddi-client/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/pom.xml?rev=756991&r1=756990&r2=756991&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/pom.xml Sat Mar 21 19:11:10 2009
@@ -150,7 +150,7 @@
             <configuration>
               <tasks>
 		<unzip dest="target" src="target/juddi-tomcat-3.0.0.SNAPSHOT.zip"/>
-	        <copy file="${basedir}/server.xml" todir="target/juddi-tomcat-3.0.0.SNAPSHOT/apache-tomcat-5.5.23/conf"/>
+	        <copy file="${basedir}/server.xml" todir="target/juddi-tomcat-3.0.0.SNAPSHOT/conf"/>
 	      </tasks>
             </configuration>
             <goals>
@@ -173,11 +173,11 @@
 	      	<wait>false</wait>
 	      	<container>
 		<containerId>tomcat5x</containerId>
-   		<home>${basedir}/target/juddi-tomcat-3.0.0.SNAPSHOT/apache-tomcat-5.5.23</home>
+   		<home>${basedir}/target/juddi-tomcat-3.0.0.SNAPSHOT</home>
 	      </container>
 	      <configuration>
 	      <type>existing</type>
-	      <home>${project.build.directory}/juddi-tomcat-3.0.0.SNAPSHOT/apache-tomcat-5.5.23</home>
+	      <home>${project.build.directory}/juddi-tomcat-3.0.0.SNAPSHOT</home>
 	      <properties>
 	      <cargo.hostname>localhost</cargo.hostname>
 	      <cargo.servlet.port>8880</cargo.servlet.port>



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org