You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by dl...@apache.org on 2006/12/14 12:59:46 UTC
svn commit: r487183 - in /portals/wsrp4j/trunk: ./
consumer-proxyportlet/src/webapp/WEB-INF/
consumer-proxyportlet/src/webapp/WEB-INF/classes/
consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/
producer/src/webapp/WEB-INF/ producer/src/web...
Author: dlouzan
Date: Thu Dec 14 03:59:45 2006
New Revision: 487183
URL: http://svn.apache.org/viewvc?view=rev&rev=487183
Log:
- Added support for specifying different tomcat dirs for proxyportlet and producer
- Modified default portlets deployed by proxyportlet
- Updated documentation
- Modified proxyportlet producers id from numbers to more descriptive strings
Modified:
portals/wsrp4j/trunk/README.txt
portals/wsrp4j/trunk/build.properties.sample
portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/log4j.properties
portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/wsrp4j-config.properties
portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@bea-8083.xml
portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@ibm-8084.xml
portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@netunity-8082.xml
portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@oracle-8086.xml
portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@vignette-8085.xml
portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@wsrp4j-8081.xml
portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/portlet.xml
portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/log4j.properties
portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/server-config.wsdd
Modified: portals/wsrp4j/trunk/README.txt
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/README.txt?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/README.txt (original)
+++ portals/wsrp4j/trunk/README.txt Thu Dec 14 03:59:45 2006
@@ -18,8 +18,9 @@
- Copy build.properties.sample to build.properties
$ cp build.properties.sample build.properties
-- Edit build.properties and enter your tomcat installation dir.
- This parameter will setup the location of your installation
+- Edit build.properties and enter your tomcat installation dir for
+ both proxyportlet and producer.
+ These parameters will setup the location of your installation
in wsrp4j configuration files, but won't actually deploy your
applications to tomcat, you have to manually add them later.
Modified: portals/wsrp4j/trunk/build.properties.sample
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/build.properties.sample?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/build.properties.sample (original)
+++ portals/wsrp4j/trunk/build.properties.sample Thu Dec 14 03:59:45 2006
@@ -18,6 +18,11 @@
#
# Rename this file to build.properties and change the values:
-# location of the Tomcat install where you want to deploy wsrp4j
-# do not use backslashes in this path
-maven.tomcat.home=/opt/apache-tomcat-5.5.16
+# Location of the Tomcat install where you want to deploy wsrp4j artifacts
+# Do not use backslashes in these paths
+
+# consumer-proxyportlet tomcat dir
+maven.tomcat.proxyportlet.home=/opt/apache-tomcat-5.5.16
+
+# producer tomcat dir
+maven.tomcat.producer.home=/opt/apache-tomcat-5.5.16
Modified: portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/log4j.properties?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/log4j.properties (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/log4j.properties Thu Dec 14 03:59:45 2006
@@ -28,7 +28,7 @@
log4j.appender.A1=org.apache.log4j.FileAppender
log4j.appender.A1.Append=false
-log4j.appender.A1.File=${maven.tomcat.home}/logs/wsrp4j-consumer.log
+log4j.appender.A1.File=${maven.tomcat.proxyportlet.home}/logs/wsrp4j-consumer.log
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c: %m%n
Modified: portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/wsrp4j-config.properties
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/wsrp4j-config.properties?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/wsrp4j-config.properties (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/classes/wsrp4j-config.properties Thu Dec 14 03:59:45 2006
@@ -41,7 +41,7 @@
# Persistence dir for Castor-based producer management. The files will be under
# directory ${wsrp4j.proxyportlet.persistence.xml.dir}/producers
wsrp4j.proxyportlet.persistence.xml.dir=\
- ${maven.tomcat.home}/webapps/wsrp4j-proxyportlet/WEB-INF
+ ${maven.tomcat.proxyportlet.home}/webapps/wsrp4j-proxyportlet/WEB-INF
# Implementation of the services needed by configportlet for producer registry
wsrp4j.configportlet.producerregistry.delegate=\
Modified: portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@bea-8083.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl%40bea-8083.xml?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@bea-8083.xml (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@bea-8083.xml Thu Dec 14 03:59:45 2006
@@ -17,7 +17,7 @@
-->
-<producer id="3">
+<producer id="bea">
<name>BEA Producer</name>
<desc>BEA Producer provided portlets</desc>
Modified: portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@ibm-8084.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl%40ibm-8084.xml?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@ibm-8084.xml (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@ibm-8084.xml Thu Dec 14 03:59:45 2006
@@ -17,7 +17,7 @@
-->
-<producer id="4">
+<producer id="ibm">
<name>IBM Producer</name>
<desc>IBM Producer provided portlets</desc>
Modified: portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@netunity-8082.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl%40netunity-8082.xml?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@netunity-8082.xml (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@netunity-8082.xml Thu Dec 14 03:59:45 2006
@@ -17,7 +17,7 @@
-->
-<producer id="2">
+<producer id="netunity">
<name>NetUnity Producer</name>
<desc>NetUnity Producer provided portlets (.NET)</desc>
Modified: portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@oracle-8086.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl%40oracle-8086.xml?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@oracle-8086.xml (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@oracle-8086.xml Thu Dec 14 03:59:45 2006
@@ -17,7 +17,7 @@
-->
-<producer id="6">
+<producer id="oracle">
<name>Oracle Producer</name>
<desc>Oracle Producer provided portlets</desc>
Modified: portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@vignette-8085.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl%40vignette-8085.xml?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@vignette-8085.xml (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@vignette-8085.xml Thu Dec 14 03:59:45 2006
@@ -17,7 +17,7 @@
-->
-<producer id="5">
+<producer id="vignette">
<name>Vignette Producer</name>
<desc>Vignette Producer provided portlets</desc>
Modified: portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@wsrp4j-8081.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl%40wsrp4j-8081.xml?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@wsrp4j-8081.xml (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@wsrp4j-8081.xml Thu Dec 14 03:59:45 2006
@@ -17,7 +17,7 @@
-->
-<producer id="1">
+<producer id="wsrp4j">
<name>WSRP4J Producer</name>
<desc>WSRP4J Producer provided portlets</desc>
Modified: portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/portlet.xml?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/wsrp4j/trunk/consumer-proxyportlet/src/webapp/WEB-INF/portlet.xml Thu Dec 14 03:59:45 2006
@@ -99,12 +99,12 @@
<portlet-preferences>
<preference>
<name>wsrp_portlet_handle</name>
- <value>AAAA-BBBB-CCCC-DDDD</value>
+ <value>0.1</value>
<read-only>false</read-only>
</preference>
<preference>
<name>wsrp_producer_id</name>
- <value>P1</value>
+ <value>wsrp4j</value>
<read-only>false</read-only>
</preference>
</portlet-preferences>
@@ -140,12 +140,12 @@
<portlet-preferences>
<preference>
<name>wsrp_portlet_handle</name>
- <value>EEEE-FFFF-GGGG-HHHH</value>
+ <value>0.2</value>
<read-only>false</read-only>
</preference>
<preference>
<name>wsrp_producer_id</name>
- <value>P2</value>
+ <value>wsrp4j</value>
<read-only>false</read-only>
</preference>
</portlet-preferences>
Modified: portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/log4j.properties?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/log4j.properties (original)
+++ portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/log4j.properties Thu Dec 14 03:59:45 2006
@@ -29,7 +29,7 @@
log4j.appender.A1=org.apache.log4j.FileAppender
log4j.appender.A1.Append=false
-log4j.appender.A1.File=${maven.tomcat.home}/logs/wsrp4j-producer.log
+log4j.appender.A1.File=${maven.tomcat.producer.home}/logs/wsrp4j-producer.log
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c: %m%n
Modified: portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/server-config.wsdd
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/server-config.wsdd?view=diff&rev=487183&r1=487182&r2=487183
==============================================================================
--- portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/server-config.wsdd (original)
+++ portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/server-config.wsdd Thu Dec 14 03:59:45 2006
@@ -21,7 +21,7 @@
<parameter name="sendMultiRefs" value="true"/>
<parameter name="disablePrettyXML" value="true"/>
<parameter name="adminPassword" value="admin"/>
- <parameter name="attachments.Directory" value="${maven.tomcat.home}/webapps/wsrp4j-producer/WEB-INF/attachments"/>
+ <parameter name="attachments.Directory" value="${maven.tomcat.producer.home}/webapps/wsrp4j-producer/WEB-INF/attachments"/>
<parameter name="dotNetSoapEncFix" value="true"/>
<parameter name="enableNamespacePrefixOptimization" value="false"/>
<parameter name="sendXMLDeclaration" value="true"/>