[portal-commits] JBoss Portal SVN: r13017 - in branches/JBoss_Portal_AS5_Deployer: core and 18 other directories.

portal-commits at lists.jboss.org portal-commits at lists.jboss.org
Wed Mar 11 03:32:08 EDT 2009


Author: mwringe
Date: 2009-03-11 03:32:08 -0400 (Wed, 11 Mar 2009)
New Revision: 13017

Modified:
   branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml
   branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml
   branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml
   branches/JBoss_Portal_AS5_Deployer/core-identity/build.xml
   branches/JBoss_Portal_AS5_Deployer/core-management/build.xml
   branches/JBoss_Portal_AS5_Deployer/core-samples/build.xml
   branches/JBoss_Portal_AS5_Deployer/core-wsrp/build.xml
   branches/JBoss_Portal_AS5_Deployer/core/build.xml
   branches/JBoss_Portal_AS5_Deployer/jems/build.xml
   branches/JBoss_Portal_AS5_Deployer/portlet-server/build.xml
   branches/JBoss_Portal_AS5_Deployer/registration/build.xml
   branches/JBoss_Portal_AS5_Deployer/search/build.xml
   branches/JBoss_Portal_AS5_Deployer/security/build.xml
   branches/JBoss_Portal_AS5_Deployer/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java
   branches/JBoss_Portal_AS5_Deployer/security/src/main/org/jboss/portal/test/security/Server.java
   branches/JBoss_Portal_AS5_Deployer/server/build.xml
   branches/JBoss_Portal_AS5_Deployer/theme/build.xml
   branches/JBoss_Portal_AS5_Deployer/widget/build.xml
   branches/JBoss_Portal_AS5_Deployer/workflow/build.xml
   branches/JBoss_Portal_AS5_Deployer/wsrp/build.xml
Log:
Temporarly update the build.xml files to reference the JBoss AS5 core libs in thirdparty.

Modified: branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -69,7 +69,7 @@
       <componentref name="jboss-portal/modules/metadata" version="trunk-SNAPSHOT"/>
       <componentref name="jboss-portal/modules/web" version="1.2.3"/>
       <componentref name="jboss-portal/modules/test" version="1.0.4"/>
-      <componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
+      <componentref name="jboss-portal/modules/portlet" version="trunk-AS5-SNAPSHOT"/>
       <componentref name="jboss-portal/modules/identity" version="1.0.8"/>
       <componentref name="jboss-portal/modules/cms" version="1.2.4"/>
       <componentref name="antlr" version="2.7.6-brew"/>
@@ -103,7 +103,7 @@
       <componentref name="ibm-wsdl4j" version="1.6.2"/>
       <componentref name="jakarta-cactus" version="1.7.2-portal"/>
       <componentref name="jakarta-io" version="1.0"/>
-      <componentref name="jbossas/core-libs" version="5.0.0.GA"/>
+<!--      <componentref name="jbossas/core-libs" version="5.0.1.GA"/> -->
       <componentref name="jboss/aop" version="2.0.0.GA"/>
       <componentref name="jboss/cache" version="1.4.1.SP10-brew"/>
       <componentref name="jboss/jboss-deployers" version="2.0.0.Beta12"/> <!-- 5.0.0.GA uses 2.0.3.GA -->
@@ -146,7 +146,7 @@
       <componentref name="tagsoup" version="1.2"/>
       <componentref name="portlet" version="2.0-Draft32"/>
       <componentref name="glassfish/jstl" version="1.2.0-brew"/>
-      <componentref name="jboss/web" version="2.1.1.GA"/>
+      <componentref name="jboss/web" version="2.1.2.GA"/>
       <!-- To use new jboss-cahce/hibernate integration library-->
       <componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider" version="1.0.0.GA"/>
    </build>

Modified: branches/JBoss_Portal_AS5_Deployer/core/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/core/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -85,6 +86,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
 
       <path id="library.classpath">
          <path refid="portlet.portlet.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/core-admin/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -85,6 +86,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
 
       <path id="library.classpath">
          <path refid="jboss.portal/modules/common.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/core-cms/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
         <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+        <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
         <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
         <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
         <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -85,6 +86,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
 
       <path id="library.classpath">
          <path refid="portlet.portlet.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -88,6 +89,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
 
       <path id="library.classpath">
          <path refid="jboss.portal/modules/common.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/core-management/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-management/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/core-management/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -85,6 +86,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
 
       <path id="library.classpath">
          <path refid="jboss.portal/modules/common.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/core-samples/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-samples/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/core-samples/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -85,6 +86,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
 
       <path id="library.classpath">
          <path refid="jboss.portal/modules/common.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/core-wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-wsrp/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/core-wsrp/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -85,6 +86,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
 
       <path id="library.classpath">
          <path refid="jboss.portal/modules/common.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/jems/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/jems/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/jems/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -87,6 +88,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
       <path id="library.classpath">
          <path refid="jboss.portal/modules/common.classpath"/>
          <path refid="jboss.portal/modules/test.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/portlet-server/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/portlet-server/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/portlet-server/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -87,6 +88,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
       <path id="library.classpath">
          <path refid="portlet.portlet.classpath"/>
          <path refid="jboss.portal/modules/common.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/registration/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/registration/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/registration/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -88,6 +89,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
       <path id="library.classpath">
          <path refid="jboss.portal/modules/common.classpath"/>
          <path refid="junit.junit.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/search/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/search/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/search/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -3,6 +3,7 @@
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
    <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
    <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
@@ -64,6 +65,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
       <path id="library.classpath">
          <path refid="jboss.portal/modules/common.classpath"/>
          <path refid="jboss.portal/modules/portlet.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/security/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/security/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/security/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -87,6 +88,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
       <path id="library.classpath">
          <path refid="jboss.portal/modules/common.classpath"/>
          <path refid="oswego.concurrent.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java	2009-03-11 07:32:08 UTC (rev 13017)
@@ -29,6 +29,7 @@
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
 import org.jboss.security.jacc.DelegatingPolicy;
 import org.jboss.security.jacc.SubjectPolicyContextHandler;
+import org.jboss.security.SecurityConstants;
 
 import javax.security.jacc.PolicyContext;
 import java.security.Policy;
@@ -83,7 +84,7 @@
    {
       // Set up the mandatory context handler
       SubjectPolicyContextHandler handler = new SubjectPolicyContextHandler();
-      PolicyContext.registerHandler(SubjectPolicyContextHandler.SUBJECT_CONTEXT_KEY, handler, true);
+      PolicyContext.registerHandler(SecurityConstants.SUBJECT_CONTEXT_KEY, handler, true);
 
       // Setup custom policy
       Policy policy = Policy.getPolicy();

Modified: branches/JBoss_Portal_AS5_Deployer/security/src/main/org/jboss/portal/test/security/Server.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/security/src/main/org/jboss/portal/test/security/Server.java	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/security/src/main/org/jboss/portal/test/security/Server.java	2009-03-11 07:32:08 UTC (rev 13017)
@@ -28,6 +28,7 @@
 import org.jboss.security.SimplePrincipal;
 import org.jboss.security.jacc.DelegatingPolicy;
 import org.jboss.security.jacc.SubjectPolicyContextHandler;
+import org.jboss.security.SecurityConstants;
 
 import javax.security.auth.Subject;
 import javax.security.jacc.PolicyContext;
@@ -53,7 +54,7 @@
    {
       // Set up the mandatory context handler
       SubjectPolicyContextHandler handler = new SubjectPolicyContextHandler();
-      PolicyContext.registerHandler(SubjectPolicyContextHandler.SUBJECT_CONTEXT_KEY, handler, true);
+      PolicyContext.registerHandler(SecurityConstants.SUBJECT_CONTEXT_KEY, handler, true);
 
       // Setup custom policy
       DelegatingPolicy p = DelegatingPolicy.getInstance();

Modified: branches/JBoss_Portal_AS5_Deployer/server/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/server/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/server/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -87,6 +88,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
       <echo message="${xdoclet.xdoclet.lib}"/>
       <echo message="${sun.servlet.lib}"/>
       <path id="library.classpath">

Modified: branches/JBoss_Portal_AS5_Deployer/theme/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/theme/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/theme/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -87,6 +88,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
       <echo message="${xdoclet.xdoclet.lib}"/>
       <echo message="${sun.servlet.lib}"/>
       <path id="library.classpath">

Modified: branches/JBoss_Portal_AS5_Deployer/widget/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/widget/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/widget/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -87,6 +88,8 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
+
       <path id="library.classpath">
          <path refid="portlet.portlet.classpath"/>
          <path refid="jboss.portal/modules/common.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/workflow/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/workflow/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/workflow/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -24,6 +24,7 @@
 
 <!DOCTYPE project [
         <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+        <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
         <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
         <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
         <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -87,6 +88,7 @@
 
       <!-- Configure thirdparty libraries -->
       &libraries;
+      &libraries-as5;
       <path id="library.classpath">
          <path refid="jboss.portal/modules/common.classpath"/>
          <path refid="apache.logging.classpath"/>

Modified: branches/JBoss_Portal_AS5_Deployer/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/wsrp/build.xml	2009-03-11 06:45:33 UTC (rev 13016)
+++ branches/JBoss_Portal_AS5_Deployer/wsrp/build.xml	2009-03-11 07:32:08 UTC (rev 13017)
@@ -23,6 +23,7 @@
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
 <!DOCTYPE project [<!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+        <!ENTITY libraries-as5 SYSTEM "../thirdparty/jboss-core-libs-libraries.ent">
         <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
         <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
         <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
@@ -97,6 +98,7 @@
       <property name="jboss.deploy.lib.dir" value="${jboss.deploy.dir}/../lib"/>
 
       <!-- Configure thirdparty libraries --> &libraries;
+      &libraries-as5;
 
       <!-- Libraries required to compile -->
       <path id="library.classpath">
@@ -108,14 +110,19 @@
          <path refid="junit.junit.classpath"/>
          <path refid="sun.servlet.classpath"/>
          <path refid="glassfish.jaf.classpath"/>
-         <pathelement path="${jbossas/core.libs.lib}/jboss-common.jar"/>
+         <pathelement path="${jbossas/core.libs.lib}/jboss-common-core.jar"/>
          <pathelement path="${jbossas/core.libs.lib}/jboss-jmx.jar"/>
          <pathelement path="${jbossas/core.libs.lib}/jboss-system.jar"/>
-         <pathelement path="${jbossas/core.libs.lib}/jboss-j2ee.jar"/>
+         <pathelement path="${jbossas/core.libs.lib}/jboss-javaee.jar"/>
          <pathelement path="${jbossas/core.libs.lib}/jboss-jaxrpc.jar"/>
-         <pathelement path="${jbossas/core.libs.lib}/jboss-saaj.jar"/>
+         <pathelement path="${jbossas/core.libs.lib}/jbossws-native-saaj.jar"/>
+         <pathelement path="${jbossas/core.libs.lib}/jboss-kernel.jar"/>         
+         <pathelement path="${jbossas/core.libs.lib}/jboss-logging-spi.jar"/>
+         <pathelement path="${jbossas/core.libs.lib}/jboss-system-jmx.jar"/>
+         <pathelement path="${jbossas/core.libs.lib}/jboss-j2se.jar"/>
+         <pathelement path="${jbossas/core.libs.lib}/jbossws-native-jaxrpc.jar"/>
+         <pathelement path="${jbossas/core.libs.lib}/jboss-deployers-core-spi.jar"/>
 
-
          <!-- needed to compile on JDK 1.4 -->
          <pathelement path="${jbossas/core.libs.lib}/namespace.jar"/>
 




More information about the portal-commits mailing list