11:26 a.m.
Author: theute
Date: 2011-09-14 12:26:48 -0400 (Wed, 14 Sep 2011)
New Revision: 7424
Modified:
epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
JBEPP-1176: GateIn PC update to 2.3.0-Beta05
Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-09-14 15:50:34 UTC (rev
7423)
+++ epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-09-14 16:26:48 UTC (rev
7424)
@@ -55,10 +55,6 @@
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
- <artifactId>pc-mc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
<artifactId>pc-federation</artifactId>
</dependency>
<dependency>
Modified:
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java
===================================================================
---
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-09-14
15:50:34 UTC (rev 7423)
+++
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-09-14
16:26:48 UTC (rev 7424)
@@ -26,7 +26,6 @@
import org.gatein.pc.bridge.BridgeInterceptor;
import org.gatein.pc.federation.FederatingPortletInvoker;
import org.gatein.pc.federation.impl.FederatingPortletInvokerService;
-import org.gatein.pc.mc.PortletApplicationDeployer;
import org.gatein.pc.portlet.PortletInvokerInterceptor;
import org.gatein.pc.portlet.aspects.CCPPInterceptor;
import org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor;
@@ -40,6 +39,7 @@
import org.gatein.pc.portlet.aspects.ValveInterceptor;
import org.gatein.pc.portlet.container.ContainerPortletDispatcher;
import org.gatein.pc.portlet.container.ContainerPortletInvoker;
+import org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer;
import org.gatein.pc.portlet.impl.state.StateManagementPolicyService;
import org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService;
import org.gatein.pc.portlet.state.StateConverter;
Modified:
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java
===================================================================
---
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-09-14
15:50:34 UTC (rev 7423)
+++
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-09-14
16:26:48 UTC (rev 7424)
@@ -23,18 +23,17 @@
import org.exoplatform.commons.utils.Safe;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
-import org.gatein.pc.mc.PortletApplicationDeployer;
+import org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer;
+import org.gatein.pc.portlet.impl.deployment.staxnav.PortletApplicationMetaDataBuilder;
import org.gatein.pc.portlet.impl.metadata.PortletApplication10MetaData;
import org.gatein.wci.WebApp;
-import org.jboss.xb.binding.JBossXBException;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.InputStream;
/**
- * Extends the {@link org.gatein.pc.mc.PortletApplicationDeployer} to inject
configuration metadata
+ * Extends the {@link org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer}
to inject configuration metadata
* from global portlet.xml and to configure the resource bundle factory of deployed
portlet
* applications. The resource bundle factory used is {@link
org.exoplatform.portal.pc.ExoResourceBundleFactory}.
*
@@ -43,6 +42,8 @@
*/
public class ExoPortletApplicationDeployer extends PortletApplicationDeployer
{
+
+ /** . */
private final Logger log =
LoggerFactory.getLogger(ExoPortletApplicationDeployer.class);
@Override
@@ -88,17 +89,16 @@
* This method is invoked for each portlet application deployment. That is necessary
for the moment
* to ensure independence between portlet applications
*
- * @return
- * @throws FileNotFoundException
- * @throws JBossXBException
+ * @return the global meta data
+ * @throws Exception any exception
*/
- private GlobalPortletMetaData loadGlobalMetadata(String globalPortletLocation) throws
FileNotFoundException,
- JBossXBException
+ private GlobalPortletMetaData loadGlobalMetadata(String globalPortletLocation) throws
Exception
{
//TODO: Avoid using File
InputStream in = new FileInputStream(new File(globalPortletLocation));
try
{
+ PortletApplicationMetaDataBuilder builder = new
PortletApplicationMetaDataBuilder();
return GlobalPortletMetaData.unmarshalling(in);
}
finally
Modified:
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java
===================================================================
---
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java 2011-09-14
15:50:34 UTC (rev 7423)
+++
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java 2011-09-14
16:26:48 UTC (rev 7424)
@@ -18,15 +18,11 @@
*/
package org.exoplatform.portal.pc;
-import org.gatein.pc.mc.metadata.factory.PortletApplicationModelFactory;
-import org.gatein.pc.mc.metadata.impl.ValueTrimmingFilter;
+import org.gatein.pc.portlet.impl.deployment.staxnav.PortletApplicationMetaDataBuilder;
import org.gatein.pc.portlet.impl.metadata.PortletApplication10MetaData;
import org.gatein.pc.portlet.impl.metadata.PortletApplication20MetaData;
import org.gatein.pc.portlet.impl.metadata.filter.FilterMappingMetaData;
import org.gatein.pc.portlet.impl.metadata.filter.FilterMetaData;
-import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
import java.io.InputStream;
import java.util.ArrayList;
@@ -135,17 +131,12 @@
//TODO: Wait for the spec of merging public render parameters
}
- public static GlobalPortletMetaData unmarshalling(InputStream in) throws
JBossXBException
- {
- Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- unmarshaller.setNamespaceAware(true);
- unmarshaller.setSchemaValidation(false);
- unmarshaller.setValidation(false);
+ /** . */
+ private static final PortletApplicationMetaDataBuilder builder = new
PortletApplicationMetaDataBuilder();
- PortletApplicationModelFactory factory = new PortletApplicationModelFactory();
-
- PortletApplication10MetaData application10MetaData =
(PortletApplication10MetaData)unmarshaller.unmarshal(in, new ValueTrimmingFilter(factory),
null);
-
+ public static GlobalPortletMetaData unmarshalling(InputStream in) throws Exception
+ {
+ PortletApplication10MetaData application10MetaData = builder.build(in);
return new GlobalPortletMetaData(application10MetaData);
}
}
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
---
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-09-14
15:50:34 UTC (rev 7423)
+++
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-09-14
16:26:48 UTC (rev 7424)
@@ -919,52 +919,6 @@
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
- <artifactId>pc-mc</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jaxb-api</artifactId>
- <groupId>sun-jaxb</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-logging-spi</artifactId>
- <groupId>org.jboss.logging</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-reflect</artifactId>
- <groupId>org.jboss</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-unit</artifactId>
- <groupId>org.jboss.unit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-common-core</artifactId>
- <groupId>org.jboss</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>apache-xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>dtdparser121</artifactId>
- <groupId>wutka-dtdparser</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xercesImpl</artifactId>
- <groupId>apache-xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jbossxb</artifactId>
- <groupId>org.jboss</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
<exclusions>
<exclusion>
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-14 15:50:34 UTC (rev 7423)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-14 16:26:48 UTC (rev 7424)
@@ -51,7 +51,7 @@
<org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version>
<org.gatein.dep.version>1.1.0-Beta06</org.gatein.dep.version>
<org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
- <org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version>
+ <org.gatein.pc.version>2.3.0-Beta05</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha04</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta05</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version>
@@ -354,11 +354,6 @@
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
- <artifactId>pc-mc</artifactId>
- <version>${org.gatein.pc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
<version>${org.gatein.pc.version}</version>
</dependency>