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/16 22:24:00 UTC
svn commit: r487888 - in /portals/wsrp4j/trunk/consumer-swingconsumer: ./
src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/ src/resources/
src/resources/persistence/ src/resources/persistence/pages/
src/resources/persistence/portlets/ src/resou...
Author: dlouzan
Date: Sat Dec 16 13:23:58 2006
New Revision: 487888
URL: http://svn.apache.org/viewvc?view=rev&rev=487888
Log:
- Fixed SwingConsumer
- Added support for executing it from within a jar with "java -jar"
Added:
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/exception-mapping.properties
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/log4j.properties
- copied, changed from r487844, portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/wsrp4j-logger.properties
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/pages/org.apache.wsrp4j.commons.consumer.driver.page.PageImpl@testpage.xml
- copied, changed from r487844, portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/pages/org.apache.wsrp4j.commons.consumer.driver.PageImpl@WSRP4JTestPortlets.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl@wsrp4j_0_1.xml
- copied, changed from r487844, portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.WSRPPortletImpl@WSRP4J_0_1.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl@wsrp4j_0_2.xml
- copied, changed from r487844, portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.WSRPPortletImpl@WSRP4J_0_2.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.ProducerImpl@wsrp4j.xml
- copied unchanged from r487844, portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.ProducerImpl@WSRP4J.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@wsrp4j.xml
Removed:
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/pages/org.apache.wsrp4j.commons.consumer.driver.PageImpl@WSRP4JTestPortlets.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.WSRPPortletImpl@WSRP4J_0_1.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.WSRPPortletImpl@WSRP4J_0_2.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.ProducerImpl@WSRP4J.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/wsrp4j-logger.properties
Modified:
portals/wsrp4j/trunk/consumer-swingconsumer/pom.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/ (props changed)
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/PageMapping.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/PortletMapping.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/ProducerMapping.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/UserMapping.xml
portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/wsrp4j-config.properties
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/pom.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/pom.xml?view=diff&rev=487888&r1=487887&r2=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/pom.xml (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/pom.xml Sat Dec 16 13:23:58 2006
@@ -25,7 +25,7 @@
<version>0.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>wsrp4j-consumer-swingconsumer</artifactId>
+ <artifactId>wsrp4j-swingconsumer</artifactId>
<packaging>jar</packaging>
<name>WSRP4J SwingConsumer</name>
<description>
@@ -34,6 +34,42 @@
</description>
<build>
<sourceDirectory>src/java</sourceDirectory>
+ <finalName>${pom.artifactId}</finalName>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/resources</directory>
+ <includes>
+ <include>wsrp4j-config.properties</include>
+ <include>log4j.properties</include>
+ <include>exception-mapping.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.wsrp4j.consumer.swingconsumer.driver.SwingConsumer</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<dependency>
@@ -65,6 +101,31 @@
<artifactId>commons-discovery</artifactId>
<groupId>commons-discovery</groupId>
<version>${commons-discovery.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>xalan</artifactId>
+ <groupId>xalan</groupId>
+ <version>${xalan.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ <version>${xerces.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ <version>${xml-apis.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>serializer</artifactId>
+ <groupId>xalan</groupId>
+ <version>${xalan.version}</version>
</dependency>
</dependencies>
</project>
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java?view=diff&rev=487888&r1=487887&r2=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/java/org/apache/wsrp4j/consumer/swingconsumer/driver/SwingConsumer.java Sat Dec 16 13:23:58 2006
@@ -88,6 +88,8 @@
import org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl;
import org.apache.wsrp4j.commons.consumer.util.ConsumerConstants;
+import org.apache.wsrp4j.commons.util.configuration.ConfigurationParametersManager;
+
import org.apache.wsrp4j.consumer.swingconsumer.interfaces.Aggregation;
import org.apache.wsrp4j.consumer.swingconsumer.interfaces.PageRegistry;
import org.apache.wsrp4j.consumer.swingconsumer.interfaces.Request;
@@ -111,9 +113,6 @@
public static final String CLONE_PORTLET = "clone.portlet";
public static final String VIEW_PROP = "view.properties";
- // The name of the property file which is used to init consumer environment
- private final String PROPERTY_FILE_NAME = "SwingConsumer.properties";
-
// maps the indecies of the tabs to the page id's
private Map tabes;
@@ -204,22 +203,12 @@
private void initConsumerEnvironment() throws WSRPException {
try {
- InputStream in = this.getClass().getClassLoader().
- getResourceAsStream(PROPERTY_FILE_NAME);
- Properties properties = new Properties();
- properties.load(in);
-
- String className = (String) properties.get(
+ String className =
+ ConfigurationParametersManager.getParameter(
ConsumerConstants.CONSUMER_ENV_CLASS);
+
Class cl = Class.forName(className);
consumerEnv = (ConsumerEnvironment)cl.newInstance();
-
- } catch (IOException ioEx) {
-
- WSRPXHelper.throwX(
- log,
- ErrorCodes.CONSUMER_PROPERTY_FILE_NOT_FOUND,
- ioEx);
} catch (Exception ex) {
Propchange: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 16 13:23:58 2006
@@ -0,0 +1 @@
+wsrp4j-swingconsumer.log
Added: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/exception-mapping.properties
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/exception-mapping.properties?view=auto&rev=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/exception-mapping.properties (added)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/exception-mapping.properties Sat Dec 16 13:23:58 2006
@@ -0,0 +1,76 @@
+# Copyright 2003-2005 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.
+
+
+###############################################################################
+# Exception Mapping
+#
+# This file specifies the mapping between WSRPExceptions (internal exceptions)
+# and exceptions defined by the WSRP specification.
+#
+# Properties:
+# - Key : error code of exception defined by WSRP specification
+# - Value: comma-separated list of error codes of internal WSRPExceptions
+#
+# NOTE:
+# - The separator "," must not be modified.
+# - For details see messages.properties.
+# - Modifying the error codes of exceptions defined by the WSRP specification
+# requires implementation adaption of class "WSRPXHelper.java".
+# - Keys followed by an empty list do not implicate that those exceptions are
+# not used.
+#
+###############################################################################
+
+# AccessDeniedFault
+1100=
+
+# InconsistentParametersFault
+1101=
+
+# InvalidRegistrationFault
+1102=
+
+# InvalidCookieFault
+1103=
+
+# InvalidHandleFault
+1104=3020
+
+# InvalidSessionFault
+1105=
+
+# InvalidUserCategoryFault
+1106=
+
+# MissingParametersFault
+1107=
+
+# OperationFailedFault
+1108=1000,1001,1002,1003,1004,2000,2001,2002,2003,2004,3000,3001,3002,3003,3004,3005,3006,3040,3041
+
+# PortletStateChangeRequiredFault
+1109=
+
+# UnsupportedLocaleFault
+1110=3002,3003
+
+# UnsupportedMarkupTypeFault
+1111=
+
+# UnsupportedModeFault
+1112=
+
+# UnsupportedWindowStateFault
+1113=
Copied: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/log4j.properties (from r487844, portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/wsrp4j-logger.properties)
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/log4j.properties?view=diff&rev=487888&p1=portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/wsrp4j-logger.properties&r1=487844&p2=portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/log4j.properties&r2=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/wsrp4j-logger.properties (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/log4j.properties Sat Dec 16 13:23:58 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.
@@ -12,42 +12,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+log4j.rootLogger=INFO, A1
-#################################################################
-#Configuration of the wsrp4j logger
-#################################################################
-
+# Select logging level: ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF
+# works hierarchically
+# use this to disable or enable log4j logging
+log4j.logger.org.apache.wsrp4j=ALL
-log4j.rootLogger=ALL, A1
log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-#log4j.appender.A1.MaxBackupIndex=1
log4j.appender.A1.Append=false
-#################################################################
-# ! ! ! Change the appropriate directory for the log file ! ! !
-#################################################################
log4j.appender.A1.File=wsrp4j-swingconsumer.log
-# Print the date in ISO 8601 format
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c: %m%n
-
-# Globally enable disable log4j logging: ALL, DEBUG, INFO, WARN, ERROR, FATAL,
-# OFF
-# works hierarchically
-# use this to disable or enable log4j logging
-log4j.logger.org.apache.wsrp4j=ALL
-log4j.logger.org.apache.axis=OFF
-#log4j.logger.org.apache.wsrp4j.producer=WARN
-#log4j.logger.org.apache.wsrp4j.consumer=ALL
-#log4j.logger.org.apache.wsrp4j.service=ALL
-
-#################################################################
-# WSRP4J logging
-#################################################################
-
-# Set the log level for wsrp4j logging: ERROR < WARN < INFO < TRACE_LOW <
-# TRACE_MEDIUM < TRACE_HIGH
-# use this to control logging
-
-#global logging
-wsrp4j.logger=TRACE_HIGH
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/PageMapping.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/PageMapping.xml?view=diff&rev=487888&r1=487887&r2=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/PageMapping.xml (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/PageMapping.xml Sat Dec 16 13:23:58 2006
@@ -19,7 +19,7 @@
<mapping>
- <class name="org.apache.wsrp4j.commons.consumer.driver.PageImpl">
+ <class name="org.apache.wsrp4j.commons.consumer.driver.page.PageImpl">
<map-to xml="page"/>
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/PortletMapping.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/PortletMapping.xml?view=diff&rev=487888&r1=487887&r2=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/PortletMapping.xml (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/PortletMapping.xml Sat Dec 16 13:23:58 2006
@@ -19,12 +19,12 @@
<mapping>
- <class name="org.apache.wsrp4j.commons.consumer.driver.WSRPPortletImpl">
+ <class name="org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl">
- <map-to xml="Portlet"/>
+ <map-to xml="portlet"/>
<field name="PortletKey"
- type="org.apache.wsrp4j.commons.consumer.driver.PortletKeyImpl"
+ type="org.apache.wsrp4j.commons.consumer.driver.portlet.PortletKeyImpl"
get-method="getPortletKey"
set-method="setPortletKey">
<bind-xml name="portlet-key" node="element"/>
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/ProducerMapping.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/ProducerMapping.xml?view=diff&rev=487888&r1=487887&r2=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/ProducerMapping.xml (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/ProducerMapping.xml Sat Dec 16 13:23:58 2006
@@ -1,8 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Object Mapping DTD Version 1.0//EN"
"http://castor.exolab.org/mapping.dtd">
+
<!--
-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.
@@ -19,9 +20,9 @@
<mapping>
- <class name="org.apache.wsrp4j.commons.consumer.driver.ProducerImpl">
-
- <map-to xml="Producer"/>
+ <class name="org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl">
+ <map-to xml="producer"/>
+
<field name="ProducerID"
type="java.lang.String"
@@ -36,7 +37,7 @@
get-method="isRegistrationRequired"
set-method="setIsRegistrationRequired"
required="false">
- <bind-xml name="registrationRequired" node="attribute"/>
+ <bind-xml name="registration-required" node="attribute"/>
</field>
<field name="RegistrationData"
@@ -55,7 +56,7 @@
<bind-xml name="markup-interface-url" node="element"/>
</field>
- <field name="ServiceDescriptionInterfaceEndpoint"
+ <field name="ServiceDescriptionInterfaceURL"
type="java.lang.String"
get-method="getServiceDescriptionInterfaceEndpoint"
set-method="initServiceDescInterface"
@@ -63,7 +64,7 @@
<bind-xml name="service-description-interface-url" node="element"/>
</field>
- <field name="RegistrationInterfaceEndpoint"
+ <field name="RegistrationInterfaceURL"
type="java.lang.String"
get-method="getRegistrationInterfaceEndpoint"
set-method="initRegistrationInterface"
@@ -79,12 +80,13 @@
<bind-xml name="portlet-management-interface-url" node="element"/>
</field>
+
<field name="Name"
type="java.lang.String"
get-method="getName"
set-method="setName"
required="false">
- <bind-xml name="Name" node="element"/>
+ <bind-xml name="name" node="element"/>
</field>
<field name="Description"
@@ -92,7 +94,7 @@
get-method="getDescription"
set-method="setDescription"
required="false">
- <bind-xml name="Desc" node="element"/>
+ <bind-xml name="desc" node="element"/>
</field>
<field name="RegistrationContext"
@@ -106,8 +108,7 @@
</class>
<class name="oasis.names.tc.wsrp.v1.types.RegistrationData">
-
- <map-to xml="RegistrationData"/>
+ <map-to xml="registration-data"/>
<field name="ConsumerName"
type="java.lang.String"
@@ -159,4 +160,4 @@
</class>
-</mapping>
\ No newline at end of file
+</mapping>
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/UserMapping.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/UserMapping.xml?view=diff&rev=487888&r1=487887&r2=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/UserMapping.xml (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/UserMapping.xml Sat Dec 16 13:23:58 2006
@@ -19,9 +19,9 @@
<mapping>
- <class name="org.apache.wsrp4j.commons.consumer.driver.UserImpl">
+ <class name="org.apache.wsrp4j.commons.consumer.driver.user.UserImpl">
- <map-to xml="User"/>
+ <map-to xml="user"/>
<field name="UserID"
type="java.lang.String"
Copied: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/pages/org.apache.wsrp4j.commons.consumer.driver.page.PageImpl@testpage.xml (from r487844, portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/pages/org.apache.wsrp4j.commons.consumer.driver.PageImpl@WSRP4JTestPortlets.xml)
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/pages/org.apache.wsrp4j.commons.consumer.driver.page.PageImpl%40testpage.xml?view=diff&rev=487888&p1=portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/pages/org.apache.wsrp4j.commons.consumer.driver.PageImpl%40WSRP4JTestPortlets.xml&r1=487844&p2=portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/pages/org.apache.wsrp4j.commons.consumer.driver.page.PageImpl%40testpage.xml&r2=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/pages/org.apache.wsrp4j.commons.consumer.driver.PageImpl@WSRP4JTestPortlets.xml (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/pages/org.apache.wsrp4j.commons.consumer.driver.page.PageImpl@testpage.xml Sat Dec 16 13:23:58 2006
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
-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.
@@ -15,19 +15,18 @@
limitations under the License.
-->
-<page pageID="1" title="WSRP4J SwingConsumer">
+<page pageID="testpage" title="WSRP4J SwingConsumer">
<portlet-key xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="java:org.apache.wsrp4j.commons.consumer.driver.PortletKeyImpl">
+ xsi:type="java:org.apache.wsrp4j.commons.consumer.driver.portlet.PortletKeyImpl">
<portlet-handle>0.1</portlet-handle>
- <producer-id>1</producer-id>
+ <producer-id>wsrp4j</producer-id>
</portlet-key>
<portlet-key xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="java:org.apache.wsrp4j.commons.consumer.driver.PortletKeyImpl">
+ xsi:type="java:org.apache.wsrp4j.commons.consumer.driver.portlet.PortletKeyImpl">
<portlet-handle>0.2</portlet-handle>
- <producer-id>1</producer-id>
+ <producer-id>wsrp4j</producer-id>
</portlet-key>
-
</page>
Copied: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl@wsrp4j_0_1.xml (from r487844, portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.WSRPPortletImpl@WSRP4J_0_1.xml)
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl%40wsrp4j_0_1.xml?view=diff&rev=487888&p1=portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.WSRPPortletImpl%40WSRP4J_0_1.xml&r1=487844&p2=portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl%40wsrp4j_0_1.xml&r2=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.WSRPPortletImpl@WSRP4J_0_1.xml (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl@wsrp4j_0_1.xml Sat Dec 16 13:23:58 2006
@@ -15,10 +15,10 @@
limitations under the License.
-->
-<Portlet>
+<portlet>
<portlet-key>
<portlet-handle>0.1</portlet-handle>
- <producer-id>1</producer-id>
+ <producer-id>wsrp4j</producer-id>
</portlet-key>
<parent-handle>0.1</parent-handle>
-</Portlet>
+</portlet>
Copied: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl@wsrp4j_0_2.xml (from r487844, portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.WSRPPortletImpl@WSRP4J_0_2.xml)
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl%40wsrp4j_0_2.xml?view=diff&rev=487888&p1=portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.WSRPPortletImpl%40WSRP4J_0_2.xml&r1=487844&p2=portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl%40wsrp4j_0_2.xml&r2=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.WSRPPortletImpl@WSRP4J_0_2.xml (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/portlets/org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl@wsrp4j_0_2.xml Sat Dec 16 13:23:58 2006
@@ -15,10 +15,10 @@
limitations under the License.
-->
-<Portlet>
+<portlet>
<portlet-key>
<portlet-handle>0.2</portlet-handle>
- <producer-id>1</producer-id>
+ <producer-id>wsrp4j</producer-id>
</portlet-key>
<parent-handle>0.2</parent-handle>
-</Portlet>
+</portlet>
Added: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@wsrp4j.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl%40wsrp4j.xml?view=auto&rev=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@wsrp4j.xml (added)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/persistence/producers/org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl@wsrp4j.xml Sat Dec 16 13:23:58 2006
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+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.
+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.
+-->
+
+<producer id="wsrp4j" registrationRequired="false">
+
+ <name>WSRP4J Producer</name>
+ <desc>WSRP4J Producer provided portlets</desc>
+
+ <markup-interface-url>
+ http://localhost:9001/wsrp4j-producer/services/WSRPBaseService
+ </markup-interface-url>
+
+ <service-description-interface-url>
+ http://localhost:9001/wsrp4j-producer/services/WSRPServiceDescriptionService
+ </service-description-interface-url>
+
+ <registration-interface-url>
+ http://localhost:9001/wsrp4j-producer/services/WSRPRegistrationService
+ </registration-interface-url>
+
+ <portlet-management-interface-url>
+ http://localhost:9001/wsrp4j-producer/services/WSRPPortletManagementService
+ </portlet-management-interface-url>
+
+ <registration-data>
+ <consumer-name>WSRP4J Swing Consumer</consumer-name>
+ <consumer-agent>WSRP4J Swing Consumer</consumer-agent>
+ </registration-data>
+
+</producer>
Modified: portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/wsrp4j-config.properties
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/wsrp4j-config.properties?view=diff&rev=487888&r1=487887&r2=487888
==============================================================================
--- portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/wsrp4j-config.properties (original)
+++ portals/wsrp4j/trunk/consumer-swingconsumer/src/resources/wsrp4j-config.properties Sat Dec 16 13:23:58 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.
@@ -12,23 +12,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-########################################################
-# #
-# WSRP4J SwingConsumer configuration file #
-# #
-########################################################
-
-########################################################
-# Define persistent file store information here. If this
-# parameter is undefined, the current runtime directory
-# will be used.
-#
-# Example: c:/wsrp/client
-#
-#consumer.persistentstore = target/
-wsrp4j.consumer.enviroment.class=\
- org.apache.wsrp4j.consumer.swingconsumer.driver.ConsumerEnvironmentImpl
+# Factory for Web Services related services
+wsrp4j.ws.factory=org.apache.wsrp4j.commons.ws.impl.WSAxisFactory
+# Class that implements all persistent behaviour
wsrp4j.consumer.persistent.factory=\
org.apache.wsrp4j.persistence.xml.driver.ConsumerPersistentFactoryImpl
+
+
+# Persistence dir for Castor-based persistence. The files will be under
+# directory ${wsrp4j.swingconsumer.persistence.xml.dir}/persistence.
+# If not specified, then the current directory will be used.
+
+#wsrp4j.swingconsumer.persistence.xml.dir=~/local/wsrp4j
+
+
+# SwingConsumer environment class implementation
+wsrp4j.consumer.environment.class=\
+ org.apache.wsrp4j.consumer.swingconsumer.driver.ConsumerEnvironmentImpl