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/11 11:43:24 UTC
svn commit: r485593 - in /portals/wsrp4j/trunk: ./ commons-consumer/
commons-producer/
commons-producer/src/java/org/apache/wsrp4j/commons/producer/interfaces/
commons/ commons/src/java/org/apache/wsrp4j/commons/persistence/driver/
commons/src/resource...
Author: dlouzan
Date: Mon Dec 11 02:43:21 2006
New Revision: 485593
URL: http://svn.apache.org/viewvc?view=rev&rev=485593
Log:
- Moved producer wsrp4j-logger.properties to log4j.properties
- Misc formatting modifications to pom files
- Corrected some old references to WSRPServices.properties instead of
wsrp4j-config.properties in producer code
- Added missing configuration parameters to producer
wsrp4j-config.properties
Added:
portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/log4j.properties
- copied, changed from r485581, portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/wsrp4j-logger.properties
Removed:
portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/wsrp4j-logger.properties
Modified:
portals/wsrp4j/trunk/commons-consumer/pom.xml
portals/wsrp4j/trunk/commons-producer/pom.xml
portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/interfaces/ConsumerRegistryAccess.java
portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/interfaces/ProviderAccess.java
portals/wsrp4j/trunk/commons/pom.xml
portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/PersistentAccess.java
portals/wsrp4j/trunk/commons/src/resources/messages.properties
portals/wsrp4j/trunk/consumer-swingconsumer/pom.xml
portals/wsrp4j/trunk/persistence-xml/pom.xml
portals/wsrp4j/trunk/pom.xml
portals/wsrp4j/trunk/producer/pom.xml
portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java
portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/castor.properties
portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/wsrp4j-config.properties
portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/config/services.properties
portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/web.xml
portals/wsrp4j/trunk/testportlet/pom.xml
Modified: portals/wsrp4j/trunk/commons-consumer/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-consumer/pom.xml?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/pom.xml (original)
+++ portals/wsrp4j/trunk/commons-consumer/pom.xml Mon Dec 11 02:43:21 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | This is the main Maven file for commons
+ | This is the main Maven file for wsrp4j-commons-consumer
| @version $Id$
+-->
<project>
Modified: portals/wsrp4j/trunk/commons-producer/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-producer/pom.xml?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/commons-producer/pom.xml (original)
+++ portals/wsrp4j/trunk/commons-producer/pom.xml Mon Dec 11 02:43:21 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | This is the main Maven file for commons
+ | This is the main Maven file for wsrp4j-commons-producer
| @version $Id$
+-->
<project>
Modified: portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/interfaces/ConsumerRegistryAccess.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/interfaces/ConsumerRegistryAccess.java?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/interfaces/ConsumerRegistryAccess.java (original)
+++ portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/interfaces/ConsumerRegistryAccess.java Mon Dec 11 02:43:21 2006
@@ -21,6 +21,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.wsrp4j.commons.util.Utility;
+import org.apache.wsrp4j.commons.util.configuration.ConfigurationParametersManager;
import org.apache.wsrp4j.commons.exception.ErrorCodes;
import org.apache.wsrp4j.commons.exception.WSRPException;
@@ -28,7 +29,7 @@
/**
* This class provides a static method to access the ConsumerRegistry.
- * Reads in the file "WSRPServices.properties".
+ * Reads in using ConfigurationParametersManager
*
* @version $Id$
*/
@@ -37,16 +38,10 @@
private static final Log log =
LogFactory.getLog(ConsumerRegistryAccess.class);
- // the name of the .properties file
- private static String WSRP_SERVICES = "WSRPServices.properties";
-
/** String representing a factory type */
public static String CONSUMER_REGISTRY_FACTORY =
"wsrp4j.producer.consumerregistry.factory";
- // the content of the properties file
- private static Properties pFactories;
-
// holds an instance of a consumer registry
private static ConsumerRegistry consumerRegistry;
@@ -98,8 +93,8 @@
Object obj = null;
try {
- pFactories = Utility.loadPropertiesFromFile(WSRP_SERVICES);
- String factoryName = (String)pFactories.get(type);
+ String factoryName = ConfigurationParametersManager.getParameter(
+ CONSUMER_REGISTRY_FACTORY);
Class cl = Class.forName(factoryName);
if (log.isDebugEnabled()) {
Modified: portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/interfaces/ProviderAccess.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/interfaces/ProviderAccess.java?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/interfaces/ProviderAccess.java (original)
+++ portals/wsrp4j/trunk/commons-producer/src/java/org/apache/wsrp4j/commons/producer/interfaces/ProviderAccess.java Mon Dec 11 02:43:21 2006
@@ -28,11 +28,12 @@
import org.apache.wsrp4j.commons.producer.provider.interfaces.ProviderFactory;
import org.apache.wsrp4j.commons.util.Utility;
+import org.apache.wsrp4j.commons.util.configuration.ConfigurationParametersManager;
/**
* This class provides a static method to access the Provider component.
- * Reads in the file "WSRPServices.properties".
+ * Reads in using ConfigurationParametersManager
*
* @version $Id$
*/
@@ -40,16 +41,10 @@
private static final Log log = LogFactory.getLog(ProviderAccess.class);
- // the name of the .properties file
- private static String WSRP_SERVICES = "WSRPServices.properties";
-
// property name of the provider factory
private static String PROVIDER_FACTORY =
"wsrp4j.producer.provider.factory";
- // the content of the properties file
- private static Properties pFactories;
-
// holds the instance of the provider after initializing
private static Provider provider;
@@ -99,10 +94,9 @@
Object obj = null;
try {
- pFactories = Utility.loadPropertiesFromFile(
- ProviderAccess.WSRP_SERVICES);
- String factoryName = (String)pFactories.get(type);
+ String factoryName = ConfigurationParametersManager.getParameter(
+ PROVIDER_FACTORY);
Class cl = Class.forName(factoryName);
obj = cl.newInstance();
Modified: portals/wsrp4j/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons/pom.xml?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/commons/pom.xml (original)
+++ portals/wsrp4j/trunk/commons/pom.xml Mon Dec 11 02:43:21 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | This is the main Maven file for commons
+ | This is the main Maven file for wsrp4j-commons
| @version $Id$
+-->
<project>
Modified: portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/PersistentAccess.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/PersistentAccess.java?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/PersistentAccess.java (original)
+++ portals/wsrp4j/trunk/commons/src/java/org/apache/wsrp4j/commons/persistence/driver/PersistentAccess.java Mon Dec 11 02:43:21 2006
@@ -34,7 +34,7 @@
/**
* This class provides a static method to access the client and server
- * persistent factories.It reads in the file "WSRPServices.properties" for the
+ * persistent factories. It reads in the file "wsrp4j-config.properties" for the
* server and the file "SwingConsumer.properties" for a client.
*
* @version $Id$
Modified: portals/wsrp4j/trunk/commons/src/resources/messages.properties
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons/src/resources/messages.properties?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/commons/src/resources/messages.properties (original)
+++ portals/wsrp4j/trunk/commons/src/resources/messages.properties Mon Dec 11 02:43:21 2006
@@ -59,7 +59,7 @@
###############################################################################
2000=Producer error.
2001=Provider-factory not found.
-2002=File "WSRPServices.properties" not found.
+2002=Configuration file not found.
2003=ConsumerRegistry-factory not found.
2004=Persistent-factory not found.
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/pom.xml?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/pom.xml (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/pom.xml Mon Dec 11 02:43:21 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | This is the main Maven file for commons
+ | This is the main Maven file for wsrp4j-swingconsumer
| @version $Id$
+-->
<project>
Modified: portals/wsrp4j/trunk/persistence-xml/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/persistence-xml/pom.xml?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/persistence-xml/pom.xml (original)
+++ portals/wsrp4j/trunk/persistence-xml/pom.xml Mon Dec 11 02:43:21 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | This is the main Maven file for commons
+ | This is the main Maven file for wsrp4j-persistence-xml
| @version $Id$
+-->
<project>
Modified: portals/wsrp4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/pom.xml?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/pom.xml (original)
+++ portals/wsrp4j/trunk/pom.xml Mon Dec 11 02:43:21 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | This is the main Maven file
+ | This is the main Maven file for wsrp4j
| @version $Id$
+-->
<project>
Modified: portals/wsrp4j/trunk/producer/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/pom.xml?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/producer/pom.xml (original)
+++ portals/wsrp4j/trunk/producer/pom.xml Mon Dec 11 02:43:21 2006
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--><!--+
- | This is the main Maven file for commons
+ | This is the main Maven file for wsrp4j-producer
| @version $Id$
+--><project>
<parent>
@@ -27,7 +27,8 @@
<packaging>war</packaging>
<name>WSRP4J Producer</name>
<description>WSRP4J Producer allows JSR-168 portlets to be exposed as WSRP-compliant
- portlets.</description>
+ portlets.
+ </description>
<build>
<sourceDirectory>src/java</sourceDirectory>
<plugins>
@@ -87,11 +88,6 @@
<artifactId>pluto-portal</artifactId>
<groupId>org.apache.pluto</groupId>
<version>${pluto.version}</version>
- </dependency>
- <dependency>
- <artifactId>commons-discovery</artifactId>
- <groupId>commons-discovery</groupId>
- <version>${commons-discovery.version}</version>
</dependency>
</dependencies>
</project>
Modified: portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java (original)
+++ portals/wsrp4j/trunk/producer/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/DescriptionHandlerImpl.java Mon Dec 11 02:43:21 2006
@@ -88,7 +88,7 @@
// name of the properties which is read
// private static final String WSRP_SERVICE_PROP =
- // "WSRPServices.properties";
+ // "wsrp4j-config.properties";
//defines an internal property name/key
// private static final String URL_TEMPLATE_PROCESSING =
Modified: portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/castor.properties
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/castor.properties?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/castor.properties (original)
+++ portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/castor.properties Mon Dec 11 02:43:21 2006
@@ -1,4 +1,4 @@
-# Copyright 2003-2005 The Apache Software Foundation.
+# Copyright 2003-2006 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.
Copied: portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/log4j.properties (from r485581, portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/wsrp4j-logger.properties)
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/log4j.properties?view=diff&rev=485593&p1=portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/wsrp4j-logger.properties&r1=485581&p2=portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/log4j.properties&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/wsrp4j-logger.properties (original)
+++ portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/log4j.properties Mon Dec 11 02:43:21 2006
@@ -28,7 +28,7 @@
log4j.appender.A1=org.apache.log4j.FileAppender
log4j.appender.A1.Append=false
-log4j.appender.A1.File=${catalina.base}/logs/wsrp4j-producer.log
+log4j.appender.A1.File=${maven.tomcat.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/classes/wsrp4j-config.properties
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/wsrp4j-config.properties?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/wsrp4j-config.properties (original)
+++ portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/classes/wsrp4j-config.properties Mon Dec 11 02:43:21 2006
@@ -1,4 +1,4 @@
-# Copyright 2003-2005 The Apache Software Foundation.
+# Copyright 2003-2006 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.
@@ -13,13 +13,20 @@
# limitations under the License.
+# Factory for Web Services related services
+wsrp4j.ws.factory=org.apache.wsrp4j.commons.ws.impl.WSAxisFactory
+
wsrp4j.producer.consumerregistry.factory=\
org.apache.wsrp4j.commons.producer.driver.ConsumerRegistryFactoryImpl
+# The implementation of backend jsr-168 services for producer
wsrp4j.producer.provider.factory=\
org.apache.wsrp4j.producer.provider.pluto.driver.ProviderFactoryImpl
+# Class that implements all persistent behaviour
wsrp4j.producer.persistent.factory=\
org.apache.wsrp4j.persistence.xml.driver.ProducerPersistentFactoryImpl
+# Set wether the producer processes consumer-supplied templates for
+# producer template processing
wsrp4j.producer.provider.doesurltemplateprocessing=false
Modified: portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/config/services.properties
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/config/services.properties?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/config/services.properties (original)
+++ portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/config/services.properties Mon Dec 11 02:43:21 2006
@@ -17,12 +17,17 @@
# The List (and Order) of Registered Services #
# ------------------------------------------- #
-org.apache.pluto.portalImpl.services.config.ConfigService=org.apache.pluto.portalImpl.services.config.ConfigServiceImpl
+org.apache.pluto.portalImpl.services.config.ConfigService=\
+ org.apache.pluto.portalImpl.services.config.ConfigServiceImpl
-org.apache.pluto.portalImpl.services.log.LogService=org.apache.pluto.portalImpl.services.log.LogServiceImpl
+org.apache.pluto.portalImpl.services.log.LogService=\
+ org.apache.pluto.portalImpl.services.log.LogServiceImpl
-org.apache.pluto.portalImpl.services.factorymanager.FactoryManagerService=org.apache.pluto.portalImpl.services.factorymanager.FactoryManagerServiceImpl
+org.apache.pluto.portalImpl.services.factorymanager.FactoryManagerService=\
+ org.apache.pluto.portalImpl.services.factorymanager.FactoryManagerServiceImpl
-org.apache.pluto.portalImpl.services.portletdefinitionregistry.PortletDefinitionRegistryService=org.apache.pluto.portalImpl.services.portletdefinitionregistry.PortletDefinitionRegistryServiceFileImpl
+org.apache.pluto.portalImpl.services.portletdefinitionregistry.PortletDefinitionRegistryService=\
+org.apache.pluto.portalImpl.services.portletdefinitionregistry.PortletDefinitionRegistryServiceFileImpl
-org.apache.pluto.portalImpl.services.portletentityregistry.PortletEntityRegistryService=org.apache.wsrp4j.producer.provider.pluto.driver.PortletPoolImpl
+org.apache.pluto.portalImpl.services.portletentityregistry.PortletEntityRegistryService=\
+ org.apache.wsrp4j.producer.provider.pluto.driver.PortletPoolImpl
Modified: portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/web.xml?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/web.xml (original)
+++ portals/wsrp4j/trunk/producer/src/webapp/WEB-INF/web.xml Mon Dec 11 02:43:21 2006
@@ -19,7 +19,7 @@
-->
<web-app>
- <display-name>wsrp4j producer</display-name>
+ <display-name>WSRP4J Producer</display-name>
<servlet>
<servlet-name>WSRP4JProducer</servlet-name>
Modified: portals/wsrp4j/trunk/testportlet/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/testportlet/pom.xml?view=diff&rev=485593&r1=485592&r2=485593
==============================================================================
--- portals/wsrp4j/trunk/testportlet/pom.xml (original)
+++ portals/wsrp4j/trunk/testportlet/pom.xml Mon Dec 11 02:43:21 2006
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--><!--+
- | This is the main Maven file for commons
+ | This is the main Maven file for wsrp4j-testportlet
| @version $Id$
+--><project>
<parent>