JBoss Portal SVN: r7765 - branches/JBoss_Portal_Branch_2_6/wsrp.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 19:05:27 -0400 (Fri, 13 Jul 2007)
New Revision: 7765
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
Log:
- Include core-wsrp in the WSRP sar.
- Clean-ups.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-13 23:04:52 UTC (rev 7764)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-13 23:05:27 UTC (rev 7765)
@@ -189,7 +189,7 @@
<property name="javadoc.protected" value="false"/>
<property name="jboss.deploy.dir" value="${jboss.home}/server/${portal.deploy.dir}"/>
- <property name="log.dir" value="${module.output}/logs"/>
+ <property name="log.dir" value="${module.output}/logs"/>
<property name="reports.dir" value="${module.output}/reports"/>
<property name="test.reports" value="${module.output}/tests"/>
<property name="build.resources.test" value="${build.resources}/tests"/>
@@ -273,11 +273,12 @@
<!--| modules. |-->
<!--+====================================================================+-->
- <target name="output"
- description="Generate WSRP Service archive."
- depends="compile">
+ <target name="output" description="Generate WSRP Service archive." depends="compile">
<mkdir dir="${build.lib}"/>
+ <!-- Build Admin GUI... -->
+ <ant antfile="../core-wsrp/build.xml" output="output.log" dir="../core-wsrp" target="output"/>
+
<!-- -->
<jar jarfile="${build.lib}/portal-wsrp-client.jar">
<fileset dir="${build.resources}/portal-wsrp-client-jar"/>
@@ -286,26 +287,12 @@
<fileset dir="${build.classes}">
<exclude name="org/jboss/portal/test/**"/>
</fileset>
- <!--<fileset dir="${build.resources}/portal-wsrp-lib-jar"/>-->
</jar>
<jar jarfile="${build.lib}/portal-wsrp-test-lib.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/portal/test/**"/>
</fileset>
</jar>
- <!--copy todir="${build.resources}/portal-wsrp-jse/WEB-INF/lib">
- <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
- <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar, myfaces-impl.jar, jstl.jar"/>
- <fileset dir="${commons.el.lib}" includes="commons-el.jar"/>
- <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/>
- <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/>
- <fileset dir="${el.el.lib}" includes="el-api.jar, el-ri.jar"/>
- <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
- <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/>
- </copy-->
- <!--copy todir="${build.resources}/portal-wsrp-jse/WEB-INF/lib">
- <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/>
- </copy-->
<jar jarfile="${build.lib}/portal-wsrp.jse">
<fileset dir="${build.resources}/portal-wsrp-jse"/>
</jar>
@@ -314,7 +301,8 @@
<fileset dir="${build.lib}" includes="portal-wsrp.jse"/>
</copy>
<copy todir="${build.resources}/portal-wsrp-sar" overwrite="true">
- <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/>
+ <fileset dir="../core-wsrp/output/lib" includes="portal-wsrp-admin.war"/>
</copy>
<jar jarfile="${build.lib}/portal-wsrp.sar">
<fileset dir="${build.resources}/portal-wsrp-sar" includes="**/*"/>
@@ -586,7 +574,7 @@
</target>
<!-- Test portlets -->
- <target name="package-test-portlets" description="Generate the test portlets archives" depends="compile">
+ <target name="package-test-portlets" description="Generate the test portlets archives" depends="compile">
<!-- Simple test portlet -->
<package-test-portlet archiveName="basic" portletName="Basic"/>
@@ -831,7 +819,6 @@
<test todir="${test.reports}"
name="org.jboss.portal.test.wsrp.other.RegistrationPropertyDescriptionTestCase"/>
<test todir="${test.reports}" name="org.jboss.portal.test.wsrp.handler.RequestHeaderClientHandlerTestCase"/>
- <!--test todir="${test.reports}" name="org.jboss.portal.test.wsrp.other.ConsumerBeanTestCase"/-->
</x-test>
<x-sysproperty>
<!--<jvmarg value="-Xdebug"/>
@@ -873,4 +860,4 @@
</sequential>
</macrodef>
-</project>
+</project>
\ No newline at end of file
16 years, 11 months
JBoss Portal SVN: r7764 - trunk/wsrp.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 19:04:52 -0400 (Fri, 13 Jul 2007)
New Revision: 7764
Modified:
trunk/wsrp/build.xml
Log:
- Include core-wsrp in the WSRP sar.
- Clean-ups.
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2007-07-13 22:45:24 UTC (rev 7763)
+++ trunk/wsrp/build.xml 2007-07-13 23:04:52 UTC (rev 7764)
@@ -273,11 +273,12 @@
<!--| modules. |-->
<!--+====================================================================+-->
- <target name="output"
- description="Generate WSRP Service archive."
- depends="compile">
+ <target name="output" description="Generate WSRP Service archive." depends="compile">
<mkdir dir="${build.lib}"/>
+ <!-- Build Admin GUI... -->
+ <ant antfile="../core-wsrp/build.xml" output="output.log" dir="../core-wsrp" target="output"/>
+
<!-- -->
<jar jarfile="${build.lib}/portal-wsrp-client.jar">
<fileset dir="${build.resources}/portal-wsrp-client-jar"/>
@@ -286,26 +287,12 @@
<fileset dir="${build.classes}">
<exclude name="org/jboss/portal/test/**"/>
</fileset>
- <!--<fileset dir="${build.resources}/portal-wsrp-lib-jar"/>-->
</jar>
<jar jarfile="${build.lib}/portal-wsrp-test-lib.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/portal/test/**"/>
</fileset>
</jar>
- <!--copy todir="${build.resources}/portal-wsrp-jse/WEB-INF/lib">
- <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
- <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar, myfaces-impl.jar, jstl.jar"/>
- <fileset dir="${commons.el.lib}" includes="commons-el.jar"/>
- <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/>
- <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/>
- <fileset dir="${el.el.lib}" includes="el-api.jar, el-ri.jar"/>
- <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
- <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/>
- </copy-->
- <!--copy todir="${build.resources}/portal-wsrp-jse/WEB-INF/lib">
- <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/>
- </copy-->
<jar jarfile="${build.lib}/portal-wsrp.jse">
<fileset dir="${build.resources}/portal-wsrp-jse"/>
</jar>
@@ -314,7 +301,8 @@
<fileset dir="${build.lib}" includes="portal-wsrp.jse"/>
</copy>
<copy todir="${build.resources}/portal-wsrp-sar" overwrite="true">
- <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/>
+ <fileset dir="../core-wsrp/output/lib" includes="portal-wsrp-admin.war"/>
</copy>
<jar jarfile="${build.lib}/portal-wsrp.sar">
<fileset dir="${build.resources}/portal-wsrp-sar" includes="**/*"/>
@@ -831,7 +819,6 @@
<test todir="${test.reports}"
name="org.jboss.portal.test.wsrp.other.RegistrationPropertyDescriptionTestCase"/>
<test todir="${test.reports}" name="org.jboss.portal.test.wsrp.handler.RequestHeaderClientHandlerTestCase"/>
- <!--test todir="${test.reports}" name="org.jboss.portal.test.wsrp.other.ConsumerBeanTestCase"/-->
</x-test>
<x-sysproperty>
<!--<jvmarg value="-Xdebug"/>
16 years, 11 months
JBoss Portal SVN: r7763 - trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 18:45:24 -0400 (Fri, 13 Jul 2007)
New Revision: 7763
Modified:
trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml
Log:
- Do not use facelets dev mode anymore.
Modified: trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml
===================================================================
--- trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2007-07-13 22:44:43 UTC (rev 7762)
+++ trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2007-07-13 22:45:24 UTC (rev 7763)
@@ -52,7 +52,7 @@
<!-- Facelet configuration -->
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
+ <param-value>false</param-value>
</context-param>
<context-param>
<param-name>facelets.SKIP_COMMENTS</param-name>
16 years, 11 months
JBoss Portal SVN: r7762 - in trunk/core-wsrp: src/resources and 1 other directory.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 18:44:43 -0400 (Fri, 13 Jul 2007)
New Revision: 7762
Removed:
trunk/core-wsrp/src/resources/portal-wsrp-admin-sar/
Modified:
trunk/core-wsrp/build.xml
Log:
- Converted portal-wsrp-admin to WAR instead of SAR so that the -object.xml definition would be correctly picked up.
- Added tests to build.
Modified: trunk/core-wsrp/build.xml
===================================================================
--- trunk/core-wsrp/build.xml 2007-07-13 22:42:18 UTC (rev 7761)
+++ trunk/core-wsrp/build.xml 2007-07-13 22:44:43 UTC (rev 7762)
@@ -135,6 +135,10 @@
<property name="javadoc.private" value="true"/>
<property name="javadoc.protected" value="false"/>
+ <property name="reports.dir" value="${module.output}/reports"/>
+ <property name="build.lib.test" value="${build.lib}/tests"/>
+ <property name="test.reports" value="${module.output}/tests"/>
+
<taskdef name="explode"
classname="org.jboss.portal.common.ant.Explode"
classpathref="explode.task.classpath"/>
@@ -143,7 +147,7 @@
classpathref="explode.task.classpath"/>
</target>
-
+
<target name="configure-explode">
<path id="explode.task.classpath">
<pathelement location="${project.tools}/lib/explode.jar"/>
@@ -184,7 +188,7 @@
depends="compile">
<mkdir dir="${build.lib}"/>
-
+
<copy todir="${build.resources}">
<fileset dir="${source.resources}" includes="**/*"/>
</copy>
@@ -195,44 +199,38 @@
<fileset dir="${build.classes}"/>
</jar>
- <copy todir="${build.resources}/portal-wsrp-admin.sar/portal-wsrp-admin.war/WEB-INF/lib2">
- <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/>
+ <!--<property name="build.wsrp-admin.war" value="${build.resources}/portal-wsrp-admin.sar/portal-wsrp-admin.war"/>-->
+ <property name="build.wsrp-admin.war" value="${build.resources}/portal-wsrp-admin-war"/>
+
+ <!-- Classes loaded by Portal's specific JSF wrapper. Note that it looks for classes in WEB-INF/lib2 -->
+ <copy todir="${build.wsrp-admin.war}/WEB-INF/lib2">
+ <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/>
<fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/>
- <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
- <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/>
- <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
- <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>
- <fileset dir="${portals.bridges/jsf.portlet.lib}" includes="jsf-portlet.jar"/>
+ <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
+ <!-- For JSF -->
+ <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/>
+ <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
+ <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>
+ <fileset dir="${portals.bridges/jsf.portlet.lib}" includes="jsf-portlet.jar"/>
+ <fileset dir="${commons.el.lib}" includes="commons-el.jar"/>
+ <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/>
+ <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/>
</copy>
- <copy todir="${build.resources}/portal-wsrp-admin.sar/portal-wsrp-admin.war">
+ <copy todir="${build.wsrp-admin.war}/WEB-INF/lib">
+ <!-- Portal specific JSF wrapper -->
+ <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/>
+ </copy>
+
+ <copy todir="${build.resources}/portal-wsrp-admin.war">
<fileset dir="${build.resources}/portal-wsrp-admin-war" includes="**/*"/>
</copy>
<jar jarfile="${build.lib}/portal-wsrp-admin.war">
- <fileset dir="${build.resources}/portal-wsrp-admin.sar/portal-wsrp-admin.war"/>
- </jar>
+ <fileset dir="${build.resources}/portal-wsrp-admin-war" includes="**/*"/>
+ </jar>
+ </target>
- <!-- portal-wsrp-admin.sar -->
- <copy todir="${build.resources}/portal-wsrp-admin.sar/">
- <fileset dir="${build.resources}/portal-wsrp-admin-sar" includes="**/*"/>
- </copy>
-
- <!-- portal-wsrp-admin.sar -->
- <copy todir="${build.resources}/portal-wsrp-admin.sar/lib">
- <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/>
- <!-- For JSF -->
- <fileset dir="${commons.el.lib}" includes="commons-el.jar"/>
- <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/>
- <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/>
- </copy>
-
- <jar jarfile="${build.lib}/portal-wsrp-admin.sar">
- <fileset dir="${build.resources}/portal-wsrp-admin-sar" includes="**/*"/>
- </jar>
-
- </target>
-
<target name="output" depends="artifacts">
<!--implode
@@ -273,37 +271,74 @@
<!-- Deployment -->
<!-- ================================================================== -->
- <!--
- | Deploy the application
- -->
-
- <target name="deploy"
- description="Deploy."
- depends="output">
+ <target name="deploy" description="Deploy." depends="output">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy file="${build.lib}/portal-wsrp-admin.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="${build.lib}/portal-wsrp-admin.war" todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
</target>
-
- <!--
- | Undeploy the application
- -->
- <target name="undeploy"
- description="Undeploy."
- depends="init">
+
+ <target name="undeploy" description="Undeploy." depends="init">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp.sar"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp-admin.war"/>
</target>
- <target name="package-tests"/>
-
-
- <!--
- Some convenience build targets to help deployment during development
- -->
- <target name="deploy-ha"
- description="Deploy."
- depends="output">
+ <target name="deploy-ha" description="Deploy in clustered environment." depends="output">
<require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <copy file="${build.lib}/portal-wsrp.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}" overwrite="true"/>
+ <copy file="${build.lib}/portal-wsrp-admin.war" todir="${jboss.home}/server/${portal-ha.deploy.dir}"
+ overwrite="true"/>
</target>
+
+ <!-- ================================================================== -->
+ <!-- Tests -->
+ <!-- ================================================================== -->
+
+ <target name="package-other-test" description="Generates the other test artifacts" depends="compile">
+ <mkdir dir="${build.lib.test}"/>
+ <jar jarfile="${build.lib.test}/test-other-lib.jar">
+ <fileset dir="${build.classes}/">
+ <include name="org/jboss/portal/test/wsrp/other/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="other-test" depends="package-other-test">
+ <execute-tests>
+ <x-test>
+ <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.other.ConsumerBeanTestCase"/>
+ </x-test>
+ <x-sysproperty>
+ <!--<jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/>
+ <jvmarg value="-Djava.compiler=NONE"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>-->
+ <sysproperty key="test.root" value="${build.lib}/tests"/>
+ </x-sysproperty>
+ <x-classpath>
+ <fileset dir="${build.lib.test}" includes="test-other-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/>
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ </x-classpath>
+ </execute-tests>
+ </target>
+
+ <target name="clean-test">
+ <!-- remove generated test xml files -->
+ <delete dir="${reports.dir}"/>
+ <delete file="tests.log"/>
+ <delete file="output.log"/>
+ </target>
+
+ <target name="tests" depends="clean-test">
+ <antcall target="other-test"/>
+ </target>
+
+ <target name="reports" depends="init">
+ <junitreport todir="${reports.dir}">
+ <fileset dir="${test.reports}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${reports.dir}"/>
+ </junitreport>
+ </target>
</project>
16 years, 11 months
JBoss Portal SVN: r7761 - branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 18:42:18 -0400 (Fri, 13 Jul 2007)
New Revision: 7761
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml
Log:
- Don't use facelets dev mode anymore.
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2007-07-13 22:41:38 UTC (rev 7760)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2007-07-13 22:42:18 UTC (rev 7761)
@@ -52,7 +52,7 @@
<!-- Facelet configuration -->
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
+ <param-value>false</param-value>
</context-param>
<context-param>
<param-name>facelets.SKIP_COMMENTS</param-name>
16 years, 11 months
JBoss Portal SVN: r7760 - in branches/JBoss_Portal_Branch_2_6/core-wsrp: src/resources and 1 other directory.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 18:41:38 -0400 (Fri, 13 Jul 2007)
New Revision: 7760
Removed:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-sar/
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml
Log:
- Converted portal-wsrp-admin to WAR instead of SAR so that the -object.xml definition would be correctly picked up.
- Added tests to build.
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-13 20:45:42 UTC (rev 7759)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-13 22:41:38 UTC (rev 7760)
@@ -135,6 +135,10 @@
<property name="javadoc.private" value="true"/>
<property name="javadoc.protected" value="false"/>
+ <property name="reports.dir" value="${module.output}/reports"/>
+ <property name="build.lib.test" value="${build.lib}/tests"/>
+ <property name="test.reports" value="${module.output}/tests"/>
+
<taskdef name="explode"
classname="org.jboss.portal.common.ant.Explode"
classpathref="explode.task.classpath"/>
@@ -143,7 +147,7 @@
classpathref="explode.task.classpath"/>
</target>
-
+
<target name="configure-explode">
<path id="explode.task.classpath">
<pathelement location="${project.tools}/lib/explode.jar"/>
@@ -184,7 +188,7 @@
depends="compile">
<mkdir dir="${build.lib}"/>
-
+
<copy todir="${build.resources}">
<fileset dir="${source.resources}" includes="**/*"/>
</copy>
@@ -195,44 +199,38 @@
<fileset dir="${build.classes}"/>
</jar>
- <copy todir="${build.resources}/portal-wsrp-admin.sar/portal-wsrp-admin.war/WEB-INF/lib2">
- <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/>
+ <!--<property name="build.wsrp-admin.war" value="${build.resources}/portal-wsrp-admin.sar/portal-wsrp-admin.war"/>-->
+ <property name="build.wsrp-admin.war" value="${build.resources}/portal-wsrp-admin-war"/>
+
+ <!-- Classes loaded by Portal's specific JSF wrapper. Note that it looks for classes in WEB-INF/lib2 -->
+ <copy todir="${build.wsrp-admin.war}/WEB-INF/lib2">
+ <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/>
<fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/>
- <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
- <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/>
- <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
- <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>
- <fileset dir="${portals.bridges/jsf.portlet.lib}" includes="jsf-portlet.jar"/>
+ <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
+ <!-- For JSF -->
+ <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/>
+ <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
+ <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>
+ <fileset dir="${portals.bridges/jsf.portlet.lib}" includes="jsf-portlet.jar"/>
+ <fileset dir="${commons.el.lib}" includes="commons-el.jar"/>
+ <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/>
+ <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/>
</copy>
- <copy todir="${build.resources}/portal-wsrp-admin.sar/portal-wsrp-admin.war">
+ <copy todir="${build.wsrp-admin.war}/WEB-INF/lib">
+ <!-- Portal specific JSF wrapper -->
+ <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/>
+ </copy>
+
+ <copy todir="${build.resources}/portal-wsrp-admin.war">
<fileset dir="${build.resources}/portal-wsrp-admin-war" includes="**/*"/>
</copy>
<jar jarfile="${build.lib}/portal-wsrp-admin.war">
- <fileset dir="${build.resources}/portal-wsrp-admin.sar/portal-wsrp-admin.war"/>
+ <fileset dir="${build.resources}/portal-wsrp-admin-war" includes="**/*"/>
</jar>
+ </target>
- <!-- portal-wsrp-admin.sar -->
- <copy todir="${build.resources}/portal-wsrp-admin.sar/">
- <fileset dir="${build.resources}/portal-wsrp-admin-sar" includes="**/*"/>
- </copy>
-
- <!-- portal-wsrp-admin.sar -->
- <copy todir="${build.resources}/portal-wsrp-admin.sar/lib">
- <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/>
- <!-- For JSF -->
- <fileset dir="${commons.el.lib}" includes="commons-el.jar"/>
- <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/>
- <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/>
- </copy>
-
- <jar jarfile="${build.lib}/portal-wsrp-admin.sar">
- <fileset dir="${build.resources}/portal-wsrp-admin-sar" includes="**/*"/>
- </jar>
-
- </target>
-
<target name="output" depends="artifacts">
<!--implode
@@ -273,37 +271,74 @@
<!-- Deployment -->
<!-- ================================================================== -->
- <!--
- | Deploy the application
- -->
-
- <target name="deploy"
- description="Deploy."
- depends="output">
+ <target name="deploy" description="Deploy." depends="output">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy file="${build.lib}/portal-wsrp-admin.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="${build.lib}/portal-wsrp-admin.war" todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
</target>
-
- <!--
- | Undeploy the application
- -->
- <target name="undeploy"
- description="Undeploy."
- depends="init">
+
+ <target name="undeploy" description="Undeploy." depends="init">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp.sar"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp-admin.war"/>
</target>
- <target name="package-tests"/>
-
-
- <!--
- Some convenience build targets to help deployment during development
- -->
- <target name="deploy-ha"
- description="Deploy."
- depends="output">
+ <target name="deploy-ha" description="Deploy in clustered environment." depends="output">
<require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <copy file="${build.lib}/portal-wsrp.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}" overwrite="true"/>
+ <copy file="${build.lib}/portal-wsrp-admin.war" todir="${jboss.home}/server/${portal-ha.deploy.dir}"
+ overwrite="true"/>
</target>
+
+ <!-- ================================================================== -->
+ <!-- Tests -->
+ <!-- ================================================================== -->
+
+ <target name="package-other-test" description="Generates the other test artifacts" depends="compile">
+ <mkdir dir="${build.lib.test}"/>
+ <jar jarfile="${build.lib.test}/test-other-lib.jar">
+ <fileset dir="${build.classes}/">
+ <include name="org/jboss/portal/test/wsrp/other/*.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="other-test" depends="package-other-test">
+ <execute-tests>
+ <x-test>
+ <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.other.ConsumerBeanTestCase"/>
+ </x-test>
+ <x-sysproperty>
+ <!--<jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/>
+ <jvmarg value="-Djava.compiler=NONE"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>-->
+ <sysproperty key="test.root" value="${build.lib}/tests"/>
+ </x-sysproperty>
+ <x-classpath>
+ <fileset dir="${build.lib.test}" includes="test-other-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/>
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ </x-classpath>
+ </execute-tests>
+ </target>
+
+ <target name="clean-test">
+ <!-- remove generated test xml files -->
+ <delete dir="${reports.dir}"/>
+ <delete file="tests.log"/>
+ <delete file="output.log"/>
+ </target>
+
+ <target name="tests" depends="clean-test">
+ <antcall target="other-test"/>
+ </target>
+
+ <target name="reports" depends="init">
+ <junitreport todir="${reports.dir}">
+ <fileset dir="${test.reports}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${reports.dir}"/>
+ </junitreport>
+ </target>
</project>
16 years, 11 months
JBoss Portal SVN: r7759 - in trunk/build/ide/intellij/idea60/modules: core-wsrp and 8 other directories.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 16:45:42 -0400 (Fri, 13 Jul 2007)
New Revision: 7759
Added:
trunk/build/ide/intellij/idea60/modules/core-wsrp/
trunk/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml
Modified:
trunk/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml
trunk/build/ide/intellij/idea60/modules/security/security.iml
trunk/build/ide/intellij/idea60/modules/server/server.iml
trunk/build/ide/intellij/idea60/modules/test/test.iml
trunk/build/ide/intellij/idea60/modules/testsuite/testsuite.iml
trunk/build/ide/intellij/idea60/modules/theme/theme.iml
trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml
trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml
Log:
- Updated IDEA modules and added core-wsrp.
Added: trunk/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml (rev 0)
+++ trunk/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml 2007-07-13 20:45:42 UTC (rev 7759)
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../../../../../../core-wsrp">
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../core-wsrp/src/main" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../core-wsrp/output" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="portlet" />
+ <orderEntry type="module" module-name="wsrp" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/sun-jsf/lib/jsf-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/junit/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="api" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntryProperties />
+ </component>
+ <component name="VcsManagerConfiguration">
+ <option name="ACTIVE_VCS_NAME" value="svn" />
+ <option name="USE_PROJECT_VCS" value="false" />
+ </component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ <LanguageOptions name="$TEMPLATE$">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="true" />
+ <option name="separateAfter" value="true" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="true" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="JBoss, a division of Red Hat Copyright &#36;today.year, Red Hat Middleware, LLC, and individual contributors as indicated by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not, write to the Free Software Foundation, Inc., 51 Fr!
anklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="CSS">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
+</module>
+
Modified: trunk/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml 2007-07-13 18:51:15 UTC (rev 7758)
+++ trunk/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml 2007-07-13 20:45:42 UTC (rev 7759)
@@ -104,7 +104,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
Modified: trunk/build/ide/intellij/idea60/modules/security/security.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/security/security.iml 2007-07-13 18:51:15 UTC (rev 7758)
+++ trunk/build/ide/intellij/idea60/modules/security/security.iml 2007-07-13 20:45:42 UTC (rev 7759)
@@ -150,7 +150,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
Modified: trunk/build/ide/intellij/idea60/modules/server/server.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/server/server.iml 2007-07-13 18:51:15 UTC (rev 7758)
+++ trunk/build/ide/intellij/idea60/modules/server/server.iml 2007-07-13 20:45:42 UTC (rev 7759)
@@ -141,7 +141,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
Modified: trunk/build/ide/intellij/idea60/modules/test/test.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-07-13 18:51:15 UTC (rev 7758)
+++ trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-07-13 20:45:42 UTC (rev 7759)
@@ -345,7 +345,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
Modified: trunk/build/ide/intellij/idea60/modules/testsuite/testsuite.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/testsuite/testsuite.iml 2007-07-13 18:51:15 UTC (rev 7758)
+++ trunk/build/ide/intellij/idea60/modules/testsuite/testsuite.iml 2007-07-13 20:45:42 UTC (rev 7759)
@@ -55,7 +55,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
Modified: trunk/build/ide/intellij/idea60/modules/theme/theme.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/theme/theme.iml 2007-07-13 18:51:15 UTC (rev 7758)
+++ trunk/build/ide/intellij/idea60/modules/theme/theme.iml 2007-07-13 20:45:42 UTC (rev 7759)
@@ -144,7 +144,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
Modified: trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml 2007-07-13 18:51:15 UTC (rev 7758)
+++ trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml 2007-07-13 20:45:42 UTC (rev 7759)
@@ -108,7 +108,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
Modified: trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-07-13 18:51:15 UTC (rev 7758)
+++ trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-07-13 20:45:42 UTC (rev 7759)
@@ -168,69 +168,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-myfaces/lib/myfaces-impl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-myfaces/lib/jstl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-myfaces/lib/myfaces-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/facelets/lib/jsf-facelets.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/el/lib/el-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/el/lib/el-ri.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../core-admin/src/etc/sun-jsf/jsf-example.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntry type="module" module-name="core" />
<orderEntryProperties />
<javadoc-paths>
@@ -281,7 +218,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
@@ -365,7 +302,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
16 years, 11 months
JBoss Portal SVN: r7758 - trunk/core/src/main/org/jboss/portal/core/impl/model/portal.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 14:51:15 -0400 (Fri, 13 Jul 2007)
New Revision: 7758
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
Log:
- JBPORTAL-1335: Improve error reporting by displaying path in case the ObjectNode was not found.
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2007-07-13 18:46:09 UTC (rev 7757)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2007-07-13 18:51:15 UTC (rev 7758)
@@ -24,6 +24,8 @@
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
import org.hibernate.Criteria;
+import org.hibernate.HibernateException;
+import org.hibernate.ObjectNotFoundException;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -258,7 +260,14 @@
Query query = session.createQuery(queryString);
query.setParameter("path", id);
query.setCacheable(true);
- result = query.uniqueResult();
+ try
+ {
+ result = query.uniqueResult();
+ }
+ catch (ObjectNotFoundException e)
+ {
+ throw new HibernateException("Could not find ObjectNode with path '" + id + "'", e);
+ }
}
else
{
16 years, 11 months
JBoss Portal SVN: r7757 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 14:46:09 -0400 (Fri, 13 Jul 2007)
New Revision: 7757
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
Log:
- JBPORTAL-1335: Improve error reporting by displaying path in case the ObjectNode was not found.
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2007-07-13 18:43:27 UTC (rev 7756)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2007-07-13 18:46:09 UTC (rev 7757)
@@ -24,6 +24,8 @@
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
import org.hibernate.Criteria;
+import org.hibernate.HibernateException;
+import org.hibernate.ObjectNotFoundException;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -258,7 +260,14 @@
Query query = session.createQuery(queryString);
query.setParameter("path", id);
query.setCacheable(true);
- result = query.uniqueResult();
+ try
+ {
+ result = query.uniqueResult();
+ }
+ catch (ObjectNotFoundException e)
+ {
+ throw new HibernateException("Could not find ObjectNode with path '" + id + "'", e);
+ }
}
else
{
16 years, 11 months
JBoss Portal SVN: r7756 - in branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules: api and 3 other directories.
by portal-commits@lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-07-13 14:43:27 -0400 (Fri, 13 Jul 2007)
New Revision: 7756
Added:
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-wsrp/
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml
Modified:
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/api/api.iml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/demo/demo.iml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml
Log:
- Updated IDEA modules and added module for core-wsrp.
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/api/api.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/api/api.iml 2007-07-13 16:06:00 UTC (rev 7755)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/api/api.iml 2007-07-13 18:43:27 UTC (rev 7756)
@@ -56,7 +56,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
@@ -140,7 +140,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
Added: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core-wsrp/core-wsrp.iml 2007-07-13 18:43:27 UTC (rev 7756)
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../../../../../../core-wsrp">
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../core-wsrp/src/main" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../core-wsrp/output" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="portlet" />
+ <orderEntry type="module" module-name="wsrp" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/sun-jsf/lib/jsf-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/junit/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="api" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntryProperties />
+ </component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ <LanguageOptions name="$TEMPLATE$">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="true" />
+ <option name="separateAfter" value="true" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="true" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="JBoss, a division of Red Hat Copyright &#36;today.year, Red Hat Middleware, LLC, and individual contributors as indicated by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not, write to the Free Software Foundation, Inc., 51 Fr!
anklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="CSS">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
+</module>
+
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/demo/demo.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/demo/demo.iml 2007-07-13 16:06:00 UTC (rev 7755)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/demo/demo.iml 2007-07-13 18:43:27 UTC (rev 7756)
@@ -12,5 +12,178 @@
<option name="ACTIVE_VCS_NAME" value="svn" />
<option name="USE_PROJECT_VCS" value="false" />
</component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ <LanguageOptions name="$TEMPLATE$">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="true" />
+ <option name="separateAfter" value="true" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="true" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="JBoss, a division of Red Hat Copyright &#36;today.year, Red Hat Middleware, LLC, and individual contributors as indicated by the @authors tag. See the copyright.txt in the distribution for a full listing of individual contributors. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not, write to the Free Software Foundation, Inc., 51 Fr!
anklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="CSS">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
</module>
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-07-13 16:06:00 UTC (rev 7755)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-07-13 18:43:27 UTC (rev 7756)
@@ -168,69 +168,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-myfaces/lib/myfaces-impl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-myfaces/lib/jstl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-myfaces/lib/myfaces-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/facelets/lib/jsf-facelets.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/el/lib/el-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/el/lib/el-ri.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../../core-admin/src/etc/sun-jsf/jsf-example.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntry type="module" module-name="core" />
<orderEntryProperties />
<javadoc-paths>
@@ -281,7 +218,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
@@ -365,7 +302,7 @@
</option>
<option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
<option name="keyword" value="Copyright" />
- <option name="fileTypeOverride" value="2" />
+ <option name="fileTypeOverride" value="1" />
<option name="relativeBefore" value="true" />
<option name="addBlankAfter" value="true" />
<option name="fileLocation" value="1" />
16 years, 11 months