Jira-ID: CRNT-24188

1)added dependencies as "ipp-portal-base-lib-module-runtime->default"  instead of "ipp-portal-common-runtime->default" to make it available in WEB-INF/lib
2)revert changes for other then Portal-Common project.

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54763 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

6 files changed, 12 insertions, 22 deletions

diff --git a/admin-portal/ivy.xml b/admin-portal/ivy.xml
index 2585f76..b2669b9 100644
--- a/admin-portal/ivy.xml
+++ b/admin-portal/ivy.xml
@@ -22,8 +22,7 @@
       <conf name="ipp-administration-perspective-runtime" extends="ipp-administration-perspective-compile" description="Administration Portal - Runtime Scope" />

       <conf name="ipp-administration-perspective-provided" description="Administration Portal - Provided Scope" />

       

-      <conf name="ipp-administration-perspective-sources" description="Administration Portal - Sources" />

-   

+      <conf name="ipp-administration-perspective-sources" description="Administration Portal - Sources" />      
       <conf name="compile" extends="ipp-administration-perspective-compile" visibility="private" description="Administration Portal" />

       

       <conf name="test" visibility="private" description="Test dependencies" />

@@ -50,8 +49,7 @@
       <dependency org="com.infinity.bpm" name="ipp-portal-common" rev="${ipp.version.full}" conf="ipp-administration-perspective-runtime->ipp-portal-common-runtime" />

       <dependency org="com.infinity.bpm" name="ipp-views-common" rev="${ipp.version.full}" conf="ipp-administration-perspective-runtime->ipp-views-common-runtime" />

       <dependency org="com.infinity.bpm" name="ipp-portal-api" rev="${ipp.version.full}" conf="ipp-administration-perspective-runtime->ipp-portal-api-runtime" />

-      <dependency org="com.infinity.bpm" name="ipp-graphics-common" rev="${ipp.version.full}" conf="ipp-administration-perspective-runtime->ipp-graphics-common-runtime" />

-	  <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-administration-perspective-runtime->default"/>
+      <dependency org="com.infinity.bpm" name="ipp-graphics-common" rev="${ipp.version.full}" conf="ipp-administration-perspective-runtime->ipp-graphics-common-runtime" />	  
 

       <!-- ipp-administration-perspective-provided -->

       <dependency org="com.infinity.bpm" name="ipp-portal-common" rev="${ipp.version.full}" conf="ipp-administration-perspective-provided->jsf-api-module-compile" />

diff --git a/business-control-center/ivy.xml b/business-control-center/ivy.xml
index 19c6289..2b20cd6 100644
--- a/business-control-center/ivy.xml
+++ b/business-control-center/ivy.xml
@@ -25,7 +25,7 @@
       <conf name="ipp-business-control-center-sources" description="Business Control Center - Sources" />

 

       <conf name="compile" extends="ipp-business-control-center-compile" visibility="private" description="Business Control Center" />

-      

+            
       <conf name="test" visibility="private" description="Test dependencies" />

 

       <conf name="pom" description="Business Control Center POMs" />

@@ -54,7 +54,6 @@
       <dependency org="net.sourceforge.jexcelapi" name="jxl" rev="2.6.10" conf="ipp-business-control-center-runtime->default">

          <exclude org="log4j" module="log4j"/>

       </dependency>

-	 <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-business-control-center-runtime->default"/>
 

       <!-- ipp-business-control-center-provided -->

       <dependency org="com.infinity.bpm" name="ipp-portal-common" rev="${ipp.version.full}" conf="ipp-business-control-center-provided->jsf-api-module-compile" />

diff --git a/graphics-common/ivy.xml b/graphics-common/ivy.xml
index c9c2738..4e97193 100644
--- a/graphics-common/ivy.xml
+++ b/graphics-common/ivy.xml
@@ -23,7 +23,7 @@
       <conf name="ipp-graphics-common-provided" description="Graphics Common - Provided Scope" />

       

       <conf name="ipp-graphics-common-sources" description="Graphics Common - Sources" />

-   

+      

       <conf name="compile" extends="ipp-graphics-common-compile, ipp-graphics-common-provided" visibility="private" description="Graphics Common" />

       <conf name="test" visibility="private" description="Test dependencies" />

       <conf name="pom" description="Graphics Common POMs" />

@@ -48,10 +48,6 @@
       <dependency org="com.infinity.bpm" name="ipp-views-common" rev="${ipp.version.full}" conf="ipp-graphics-common-runtime->ipp-views-common-runtime" />

       <dependency org="com.sun.jersey" name="jersey-core" rev="1.1.5.1" conf="ipp-graphics-common-runtime->default" />

       <dependency org="com.sun.jersey" name="jersey-server" rev="1.1.5.1" conf="ipp-graphics-common-runtime->default" />

-      <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-graphics-common-runtime->default"/>

-      <dependency org="org.springframework" name="spring-beans" transitive="false" rev="3.0.5.RELEASE" conf="ipp-graphics-common-runtime->default"/>

-      <dependency org="org.springframework" name="spring-context" transitive="false" rev="3.0.5.RELEASE" conf="ipp-graphics-common-runtime->default"/>

-      <dependency org="org.springframework" name="spring-web" transitive="false" rev="3.0.5.RELEASE" conf="ipp-graphics-common-runtime->default"/>

       

       <!-- ipp-graphics-common-provided -->

       <dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="ipp-graphics-common-provided->default" />

diff --git a/portal-common/ivy.xml b/portal-common/ivy.xml
index ee18c1c..cb5a30f 100644
--- a/portal-common/ivy.xml
+++ b/portal-common/ivy.xml
@@ -75,9 +75,6 @@
       <dependency org="commons-collections" name="commons-collections" rev="3.2" conf="ipp-portal-common-runtime->default" />

       <dependency org="commons-digester" name="commons-digester" rev="1.8" conf="ipp-portal-common-runtime->default" />

       <dependency org="commons-lang" name="commons-lang" rev="2.4" conf="ipp-portal-common-runtime->default" />

-      <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-common-runtime->default"/>
-      <dependency org="org.springframework" name="spring-beans" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-common-runtime->default"/>
-      <dependency org="org.springframework" name="spring-context" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-common-runtime->default"/>
 
 

       <!-- ipp-portal-common-provided -->

@@ -103,7 +100,7 @@
       <!-- jsf-mojarra-module-runtime -->

       <dependency org="javax.faces" name="jsf-impl" rev="1.1_02" conf="jsf-mojarra-module-runtime->default" />

 

-      <!-- ipp-portal-base-lib-module-runtime: any modification results in a change of the WEB-INF/lib folder and therefore configure must be adjusted -->

+      <!-- ipp-portal-base-lib-module-runtime: any modification results in a change of the WEB-INF/lib folder and therefore configure must be adjusted -->      
       <dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.1.5" conf="ipp-portal-base-lib-module-runtime->default">

          <exclude org="javax.servlet" module="jstl"/>

       </dependency>

@@ -123,7 +120,11 @@
       <dependency org="net.sourceforge.jexcelapi" name="jxl" rev="2.6.10" conf="ipp-portal-base-lib-module-runtime->default">

          <exclude org="log4j" module="log4j"/>

       </dependency>

+      <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
+      <dependency org="org.springframework" name="spring-beans" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
+      <dependency org="org.springframework" name="spring-context" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
       <dependency org="org.springframework" name="spring-webmvc" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>
+      <dependency org="org.springframework" name="spring-web" transitive="false" rev="3.0.5.RELEASE" conf="ipp-portal-base-lib-module-runtime->default"/>            
       <dependency org="aopalliance" name="aopalliance" transitive="false" rev="1.0" conf="ipp-portal-base-lib-module-runtime->default"/>
       <dependency org="org.apache.geronimo.specs" name="geronimo-ejb_2.1_spec" transitive="false" rev="1.1" conf="ipp-portal-base-lib-module-runtime->default"/>
       <dependency org="commons-discovery" name="commons-discovery" rev="0.4" conf="ipp-portal-base-lib-module-runtime->default"/>

diff --git a/process-portal/ivy.xml b/process-portal/ivy.xml
index 1da0f70..0500b41 100644
--- a/process-portal/ivy.xml
+++ b/process-portal/ivy.xml
@@ -57,8 +57,6 @@
       <dependency org="com.infinity.bpm" name="ipp-views-common" rev="${ipp.version.full}" conf="ipp-workflow-perspective-runtime->ipp-views-common-runtime" />

       <dependency org="com.infinity.bpm" name="ipp-portal-api" rev="${ipp.version.full}" conf="ipp-workflow-perspective-runtime->ipp-portal-api-runtime" />

       <dependency org="com.infinity.bpm" name="ipp-graphics-common" rev="${ipp.version.full}" conf="ipp-workflow-perspective-runtime->ipp-graphics-common-runtime" />

-      <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-workflow-perspective-runtime->default"/>
-      <dependency org="org.springframework" name="spring-beans" transitive="false" rev="3.0.5.RELEASE" conf="ipp-workflow-perspective-runtime->default"/>
    

       <!-- ipp-workflow-perspective-provided -->

       <dependency org="com.infinity.bpm" name="ipp-portal-common" rev="${ipp.version.full}" conf="ipp-workflow-perspective-provided->jsf-api-module-compile" />

diff --git a/views-common/ivy.xml b/views-common/ivy.xml
index ad47b1a..c97411a 100644
--- a/views-common/ivy.xml
+++ b/views-common/ivy.xml
@@ -20,7 +20,7 @@
    <configurations>

       <conf name="ipp-views-common-compile" description="Views Common - Compile Scope" />

       <conf name="ipp-views-common-runtime" extends="ipp-views-common-compile" description="Views Common - Runtime Scope" />

-      <conf name="ipp-views-common-provided" description="Views Common - Provided Scope" />

+      <conf name="ipp-views-common-provided" description="Views Common - Provided Scope" />     
       

       <conf name="ipp-views-common-sources" description="Views Common - Sources" />

    

@@ -64,9 +64,7 @@
       <dependency org="com.sun.jersey" name="jersey-core" rev="1.1.5.1" conf="ipp-views-common-runtime->default" />

       <dependency org="com.sun.jersey" name="jersey-server" rev="1.1.5.1" conf="ipp-views-common-runtime->default" />

       <dependency org="com.infinity.bpm" name="carnot-spring-module" rev="${ipp.version.full}" conf="ipp-views-common-runtime->spring-module-runtime" />

- 	  <dependency org="org.springframework" name="spring-core" transitive="false" rev="3.0.5.RELEASE" conf="ipp-views-common-runtime->default"/>
-      <dependency org="org.springframework" name="spring-beans" transitive="false" rev="3.0.5.RELEASE" conf="ipp-views-common-runtime->default"/>
-

+ 
       <!-- ipp-views-common-provided -->

       <dependency org="com.infinity.bpm" name="ipp-portal-common" rev="${ipp.version.full}" conf="ipp-views-common-provided->jsf-api-module-compile" />

       <dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="ipp-views-common-provided, compile->default" />

@@ -77,7 +75,7 @@
       <dependency org="javax.faces" name="jsf-api" rev="1.1_02" conf="compile->default" />

 

       <!-- test -->

-      <dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />

+      <dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />     
       

       <override org="commons-beanutils" module="commons-beanutils" rev="1.8.0" />

       <override org="commons-digester" module="commons-digester" rev="1.8" />