Author: julien(a)jboss.com
Date: 2008-04-14 06:27:36 -0400 (Mon, 14 Apr 2008)
New Revision: 10571
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-cms/core-cms.iml
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-samples/core-samples.iml
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core/core.iml
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/widget/widget.iml
Log:
missing thirdparty update :-)
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-04-14 05:47:45 UTC
(rev 10570)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-04-14 10:27:36 UTC
(rev 10571)
@@ -47,10 +47,10 @@
are pushed to the
http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common"
version="trunk-SNAPSHOT"/>
- <componentref name="jboss-portal/modules/web"
version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/common"
version="1.2.0.Beta3"/>
+ <componentref name="jboss-portal/modules/web"
version="1.2.0.Beta3"/>
<componentref name="jboss-portal/modules/test"
version="1.0.1"/>
- <componentref name="jboss-portal/modules/portlet"
version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/portlet"
version="2.0.0.CR2"/>
<componentref name="jboss-portal/modules/identity"
version="1.0.1"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
Modified:
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core/core.iml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core/core.iml 2008-04-14
05:47:45 UTC (rev 10570)
+++
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core/core.iml 2008-04-14
10:27:36 UTC (rev 10571)
@@ -376,7 +376,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar!/"
/>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -385,7 +385,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar!/"
/>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -394,7 +394,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar!/"
/>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -403,31 +403,50 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/"
/>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="library" name="identity"
level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar!/"
/>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="library" name="identity"
level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/"
/>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-bridge-lib.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-management-lib.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-controller-lib.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="library" name="portlet api"
level="project" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified:
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-cms/core-cms.iml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-cms/core-cms.iml 2008-04-14
05:47:45 UTC (rev 10570)
+++
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-cms/core-cms.iml 2008-04-14
10:27:36 UTC (rev 10571)
@@ -148,6 +148,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="library" name="portlet api"
level="project" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified:
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-samples/core-samples.iml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-samples/core-samples.iml 2008-04-14
05:47:45 UTC (rev 10570)
+++
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/core-samples/core-samples.iml 2008-04-14
10:27:36 UTC (rev 10571)
@@ -28,6 +28,141 @@
</packaging>
</configuration>
</facet>
+ <facet type="web" name="Web2" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-jsp-samples-war/WEB-INF/web.xml"
optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root
url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-jsp-samples-war"
relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION"
value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES"
value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true"
/>
+ <setting name="RUN_JASPER_VALIDATION" value="true"
/>
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false"
/>
+ </building>
+ <packaging>
+ <containerElement type="module" name="core-samples">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
+ <facet type="web" name="Web3" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-news-samples-war/WEB-INF/web.xml"
optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root
url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-news-samples-war"
relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION"
value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES"
value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true"
/>
+ <setting name="RUN_JASPER_VALIDATION" value="true"
/>
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false"
/>
+ </building>
+ <packaging>
+ <containerElement type="module" name="core-samples">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
+ <facet type="web" name="Web4" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-users-samples-war/WEB-INF/web.xml"
optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root
url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-users-samples-war"
relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION"
value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES"
value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true"
/>
+ <setting name="RUN_JASPER_VALIDATION" value="true"
/>
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false"
/>
+ </building>
+ <packaging>
+ <containerElement type="module" name="core-samples">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
+ <facet type="web" name="Web5" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-weather-samples-war/WEB-INF/web.xml"
optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root
url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-weather-samples-war"
relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION"
value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES"
value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true"
/>
+ <setting name="RUN_JASPER_VALIDATION" value="true"
/>
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false"
/>
+ </building>
+ <packaging>
+ <containerElement type="module" name="core-samples">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
+ <facet type="web" name="Web6" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-portlet-samples-war/WEB-INF/web.xml"
optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root
url="file://$MODULE_DIR$/../../../../../../core-samples/src/resources/portal-portlet-samples-war"
relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION"
value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES"
value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true"
/>
+ <setting name="RUN_JASPER_VALIDATION" value="true"
/>
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false"
/>
+ </building>
+ <packaging>
+ <containerElement type="module" name="core-samples">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
</component>
<component name="NewModuleRootManager"
inherit-compiler-output="false">
<output
url="file://$MODULE_DIR$/../../../../../../core-samples/output/idea/classes"
/>
@@ -99,6 +234,16 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="library" name="portlet api"
level="project" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified:
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/widget/widget.iml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/widget/widget.iml 2008-04-14
05:47:45 UTC (rev 10570)
+++
branches/JBoss_Portal_Branch_2_7/build/ide/intellij/idea70/modules/widget/widget.iml 2008-04-14
10:27:36 UTC (rev 10571)
@@ -28,6 +28,33 @@
</packaging>
</configuration>
</facet>
+ <facet type="web" name="Web" implicit="true">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/../../../../../../widget/src/resources/portal-widget-netvibes-war/WEB-INF/web.xml"
optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root
url="file://$MODULE_DIR$/../../../../../../widget/src/resources/portal-widget-netvibes-war"
relative="/" />
+ </webroots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION"
value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES"
value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true"
/>
+ <setting name="RUN_JASPER_VALIDATION" value="true"
/>
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false"
/>
+ </building>
+ <packaging>
+ <containerElement type="module" name="widget">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
</component>
<component name="NewModuleRootManager"
inherit-compiler-output="false">
<output
url="file://$MODULE_DIR$/../../../../../../widget/output/idea/classes" />
@@ -104,6 +131,15 @@
</library>
</orderEntry>
<orderEntry type="library" name="portlet api"
level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">