Fix packaging issue due to recent refactor of poms

gatein · Jun 25, 2013 · bd3cbaa · bd3cbaa
1 parent bcf49c5
commit bd3cbaa
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 165 deletions.
diff --git a/component/portal/pom.xml b/component/portal/pom.xml
@@ -53,6 +53,11 @@
       <artifactId>mop-api</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.gatein.pc</groupId>
+      <artifactId>pc-api</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.gatein.mop</groupId>
       <artifactId>mop-spi</artifactId>

diff --git a/...t/portal/src/main/java/org/exoplatform/portal/application/ResourceBundleDelegateImpl.java b/...t/portal/src/main/java/org/exoplatform/portal/application/ResourceBundleDelegateImpl.java
diff --git a/...nent/portal/src/main/java/org/exoplatform/portal/portlet/LogPortletExceptionListener.java b/...nent/portal/src/main/java/org/exoplatform/portal/portlet/LogPortletExceptionListener.java
diff --git a/...nt/portal/src/main/java/org/exoplatform/portal/portlet/PortletExceptionHandleService.java b/...nt/portal/src/main/java/org/exoplatform/portal/portlet/PortletExceptionHandleService.java
diff --git a/component/portal/src/main/java/org/exoplatform/portal/portlet/PortletExceptionListener.java b/component/portal/src/main/java/org/exoplatform/portal/portlet/PortletExceptionListener.java
diff --git a/portal/web/src/main/assembly/tomcat-distrib.xml b/portal/web/src/main/assembly/tomcat-distrib.xml
@@ -43,7 +43,7 @@
     </dependencySet>
     <dependencySet>
       <includes>
-        <include>org.gatein.portal:org.gatein.portal.examples.portlets:war</include>
+        <include>org.gatein.portal:examples.portlets:war</include>
       </includes>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <useProjectArtifact>false</useProjectArtifact>

diff --git a/portal/web/src/main/assembly/tomcat-portal.xml b/portal/web/src/main/assembly/tomcat-portal.xml
@@ -31,7 +31,6 @@
         <include>org.staxnav:staxnav.core</include>
         <include>commons-logging:commons-logging</include>
         <include>org.slf4j:slf4j-api</include>
-        <include>org.slf4j:slf4j-jdk14</include>
         <include>org.exoplatform.kernel:exo.kernel.commons</include>
         <include>org.exoplatform.kernel:exo.kernel.container</include>
         <include>picocontainer:picocontainer</include>
@@ -48,11 +47,11 @@
         <include>org.gatein.pc:pc-api</include>
         <include>org.gatein.pc:pc-portlet</include>
         <include>org.gatein.mop:mop-api</include>
-        <include>org.gatein.portal:exo.portal.component.common</include>
-        <include>org.gatein.portal:exo.portal.component.portal</include>
+        <include>org.gatein.portal:component.common</include>
+        <include>org.gatein.portal:component.portal</include>
+        <include>org.gatein.portal:component.identity</include>
         <include>org.gatein.portal:portal.common</include>
         <include>org.gatein.portal:portal.ui</include>
-        <include>org.gatein.portal:exo.portal.component.identity</include>
         <include>org.exoplatform.kernel:exo.kernel.component.common</include>
         <include>org.exoplatform.kernel:exo.kernel.component.cache</include>
         <include>org.exoplatform.core:exo.core.component.organization.api</include>