You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2008/10/22 03:11:31 UTC
svn commit: r706832 - in /portals/pluto/branches/2.0-spi-refactoring:
pluto-container/ pluto-portal-driver-impl/
pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/
pluto-site/src/site/xdoc/v20/ pluto-testsuite/
Author: ate
Date: Tue Oct 21 18:11:30 2008
New Revision: 706832
URL: http://svn.apache.org/viewvc?rev=706832&view=rev
Log:
Further and possible now completion of PLUTO-511: Separate Pluto implementation from required interfaces in shared class loader
See: http://issues.apache.org/jira/browse/PLUTO-511
There were a few minor issues with providing the correct current context classloader for JAXB and a gone missing required dependency for a stax implementation (needed when deserializing and Event payload).
The related Portlet 2.0 TCK tests for these now all pass again!
Furthermore, I noticed a few other incorrect/unneeded transitive dependencies creeping in (like in the testsuite) which now also should all be resolved.
Modified:
portals/pluto/branches/2.0-spi-refactoring/pluto-container/pom.xml
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/pom.xml
portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-site/src/site/xdoc/v20/getting-started.xml
portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/pom.xml
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/pom.xml?rev=706832&r1=706831&r2=706832&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/pom.xml (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/pom.xml Tue Oct 21 18:11:30 2008
@@ -47,6 +47,16 @@
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Specification Libraries =========================================== -->
@@ -63,18 +73,36 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-impl.version}</version>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-impl.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax.api.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>${stax.impl.version}</version>
+ <scope>compile</scope>
+ </dependency>
<!-- CCPP Libraries -->
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/pom.xml?rev=706832&r1=706831&r2=706832&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/pom.xml Tue Oct 21 18:11:30 2008
@@ -55,6 +55,12 @@
<artifactId>commons-digester</artifactId>
<version>${commons-digester.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -97,6 +103,12 @@
<artifactId>spring-core</artifactId>
<version>${springframework.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -117,6 +129,12 @@
<artifactId>spring-web</artifactId>
<version>${springframework.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java?rev=706832&r1=706831&r2=706832&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java Tue Oct 21 18:11:30 2008
@@ -163,18 +163,27 @@
"Object payload must implement Serializable");
} else {
- Class clazz = value.getClass();
-
- JAXBContext jc = JAXBContext.newInstance(clazz);
-
- Marshaller marshaller = jc.createMarshaller();
+ Writer out = new StringWriter();
- Writer out = new StringWriter();
+ Class clazz = value.getClass();
- JAXBElement<Serializable> element = new JAXBElement<Serializable>(
- qname, clazz, value);
- marshaller.marshal(element, out);
- // marshaller.marshal(value, out);
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+ JAXBContext jc = JAXBContext.newInstance(clazz);
+
+ Marshaller marshaller = jc.createMarshaller();
+
+ JAXBElement<Serializable> element = new JAXBElement<Serializable>(
+ qname, clazz, value);
+ marshaller.marshal(element, out);
+ // marshaller.marshal(value, out);
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(cl);
+ }
if (out != null) {
savedEvents.addEvent(new EventImpl(qname,
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-site/src/site/xdoc/v20/getting-started.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-site/src/site/xdoc/v20/getting-started.xml?rev=706832&r1=706831&r2=706832&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-site/src/site/xdoc/v20/getting-started.xml (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-site/src/site/xdoc/v20/getting-started.xml Tue Oct 21 18:11:30 2008
@@ -36,8 +36,8 @@
<ul>
<li>portlet-api-2.0.jar</li>
<li>ccpp-1.0.jar (Pluto 2.0 only)</li>
- <li>pluto-container-api-2.0.jar (or the build version of Pluto you are using)</li>
- <li>pluto-taglib-2.0.jar (or the build version of Pluto you are using)</li>
+ <li>pluto-container-api-2.0.0.jar (or the build version of Pluto you are using)</li>
+ <li>pluto-taglib-2.0.0.jar (or the build version of Pluto you are using)</li>
</ul>
</p>
<p>
@@ -47,8 +47,9 @@
<li>commons-logging-api-1.1.jar</li>
<li>jaxb-api-2.1.jar</li>
<li>jaxb-impl-2.1.8.jar</li>
- <li>pluto-container-2.0.0-SNAPSHOT.jar</li>
- <li>stax-api-1.0-2.jar</li>
+ <li>pluto-container-2.0.0.jar (or the build version of Pluto you are using)</li>
+ <li>stax-api-1.0.1.jar</li>
+ <li>stax-1.2.0.jar</li>
</ul>
</p>
</section>
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/pom.xml?rev=706832&r1=706831&r2=706832&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/pom.xml (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-testsuite/pom.xml Tue Oct 21 18:11:30 2008
@@ -66,6 +66,22 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>${taglibs.standard.version}</version>
@@ -77,12 +93,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<!-- Build configuration -->