JBoss Portal SVN: r11895 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-11 19:50:33 -0400 (Thu, 11 Sep 2008)
New Revision: 11895
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
- Fixed improper imports.
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-09-11 23:46:37 UTC (rev 11894)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-09-11 23:50:33 UTC (rev 11895)
@@ -3,8 +3,10 @@
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ page isELIgnored="false" %>
-<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants,
- java.text.Format" %>
+<%@ page import="org.jboss.portal.cms.model.Content" %>
+<%@ page import="org.jboss.portal.cms.util.NodeUtil" %>
+<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
+<%@ page import="java.text.Format" %>
<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="java.util.Collection" %>
<%@ page import="java.util.Iterator" %>
17 years, 7 months
JBoss Portal SVN: r11894 - branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-11 19:46:37 -0400 (Thu, 11 Sep 2008)
New Revision: 11894
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
- I said: fixed improper imports!
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-09-11 23:45:27 UTC (rev 11893)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-09-11 23:46:37 UTC (rev 11894)
@@ -3,6 +3,8 @@
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ page isELIgnored="false" %>
+<%@ page import="org.jboss.portal.cms.model.Content" %>
+<%@ page import="org.jboss.portal.cms.util.NodeUtil" %>
<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
<%@ page import="java.text.Format" %>
<%@ page import="java.text.SimpleDateFormat" %>
17 years, 7 months
JBoss Portal SVN: r11893 - branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-11 19:45:27 -0400 (Thu, 11 Sep 2008)
New Revision: 11893
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
- Fixed improper imports... :/
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-09-11 21:30:44 UTC (rev 11892)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-09-11 23:45:27 UTC (rev 11893)
@@ -3,8 +3,8 @@
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ page isELIgnored="false" %>
-<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants,
- java.text.Format" %>
+<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
+<%@ page import="java.text.Format" %>
<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="java.util.Collection" %>
<%@ page import="java.util.Iterator" %>
17 years, 7 months
JBoss Portal SVN: r11892 - tags/JBoss_Portal_2_7_0_CR1/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-11 17:30:44 -0400 (Thu, 11 Sep 2008)
New Revision: 11892
Modified:
tags/JBoss_Portal_2_7_0_CR1/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
No comment...
Modified: tags/JBoss_Portal_2_7_0_CR1/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- tags/JBoss_Portal_2_7_0_CR1/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-09-11 20:19:10 UTC (rev 11891)
+++ tags/JBoss_Portal_2_7_0_CR1/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-09-11 21:30:44 UTC (rev 11892)
@@ -3,8 +3,10 @@
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ page isELIgnored="false" %>
-<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants,
- java.text.Format" %>
+<%@ page import="org.jboss.portal.cms.model.Content" %>
+<%@ page import="org.jboss.portal.cms.util.NodeUtil" %>
+<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
+<%@ page import="java.text.Format" %>
<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="java.util.Collection" %>
<%@ page import="java.util.Iterator" %>
@@ -457,4 +459,4 @@
</table>
<%}%>
</div>
-</div>
\ No newline at end of file
+</div>
17 years, 8 months
JBoss Portal SVN: r11891 - modules/web/tags/JBP_WEB_1_2_1/web/src/test.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-11 16:19:10 -0400 (Thu, 11 Sep 2008)
New Revision: 11891
Modified:
modules/web/tags/JBP_WEB_1_2_1/web/src/test/build.xml
Log:
Do not force JBoss 5 and Jetty tests
Modified: modules/web/tags/JBP_WEB_1_2_1/web/src/test/build.xml
===================================================================
--- modules/web/tags/JBP_WEB_1_2_1/web/src/test/build.xml 2008-09-11 19:56:10 UTC (rev 11890)
+++ modules/web/tags/JBP_WEB_1_2_1/web/src/test/build.xml 2008-09-11 20:19:10 UTC (rev 11891)
@@ -112,7 +112,6 @@
</not>
</and>
</condition>
-
<fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME or JBOSS_4_2_2_HOME">
<condition>
<and>
@@ -131,7 +130,7 @@
</and>
</condition>
</fail>
-
+<!--
<fail message="Please set the environment variable JBOSS_5_0_HOME">
<condition>
<and>
@@ -144,7 +143,7 @@
</and>
</condition>
</fail>
-
+-->
<fail message="Please set the environment variable TOMCAT_6_0_HOME">
<condition>
<and>
@@ -157,7 +156,7 @@
</and>
</condition>
</fail>
-
+<!--
<fail message="Please set the environment variable JETTY_6_1_HOME">
<condition>
<and>
@@ -170,8 +169,8 @@
</and>
</condition>
</fail>
+-->
-
</target>
<target name="package-tests">
17 years, 8 months
JBoss Portal SVN: r11890 - in modules/portlet/tags/JBP_PORTLET_2_0_3: portal/src and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-11 15:56:10 -0400 (Thu, 11 Sep 2008)
New Revision: 11890
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_3/build/distrib/distrib.xml
modules/portlet/tags/JBP_PORTLET_2_0_3/portal/src/build.xml
modules/portlet/tags/JBP_PORTLET_2_0_3/test/src/test/build.xml
Log:
Do not fail if JBOSS_5_0_HOME is not set
Modified: modules/portlet/tags/JBP_PORTLET_2_0_3/build/distrib/distrib.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_3/build/distrib/distrib.xml 2008-09-11 16:57:54 UTC (rev 11889)
+++ modules/portlet/tags/JBP_PORTLET_2_0_3/build/distrib/distrib.xml 2008-09-11 19:56:10 UTC (rev 11890)
@@ -2,9 +2,9 @@
<property name="source.dir" value="../.."/>
<property name="src.docs.dir" value="${source.dir}/docs"/>
- <property name="pc.release.version" value="2.1.0-SNAPSHOT"/>
- <property name="demo.release.version" value="2.1.0-SNAPSHOT"/>
- <property name="maven.version" value="2.1.0-SNAPSHOT"/>
+ <property name="pc.release.version" value="2.0.3"/>
+ <property name="demo.release.version" value="2.0.3"/>
+ <property name="maven.version" value="2.0.3"/>
<!-- -->
<property name="pc.release.name" value="jboss-portletcontainer-${pc.release.version}"/>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_3/portal/src/build.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_3/portal/src/build.xml 2008-09-11 16:57:54 UTC (rev 11889)
+++ modules/portlet/tags/JBP_PORTLET_2_0_3/portal/src/build.xml 2008-09-11 19:56:10 UTC (rev 11890)
@@ -204,7 +204,7 @@
</and>
</condition>
</fail>
-
+<!--
<fail message="Please set the environment variable JBOSS_5_0_HOME">
<condition>
<and>
@@ -214,7 +214,7 @@
</and>
</condition>
</fail>
-
+-->
<fail message="Please set the environment variable TOMCAT_6_0_HOME">
<condition>
<and>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_3/test/src/test/build.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_3/test/src/test/build.xml 2008-09-11 16:57:54 UTC (rev 11889)
+++ modules/portlet/tags/JBP_PORTLET_2_0_3/test/src/test/build.xml 2008-09-11 19:56:10 UTC (rev 11890)
@@ -258,7 +258,7 @@
</and>
</condition>
</fail>
-
+<!--
<fail message="Please set the environment variable JBOSS_5_0_HOME">
<condition>
<and>
@@ -268,7 +268,7 @@
</and>
</condition>
</fail>
-
+-->
<fail message="Please set the environment variable TOMCAT_6_0_HOME">
<condition>
<and>
17 years, 8 months
JBoss Portal SVN: r11889 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-11 12:57:54 -0400 (Thu, 11 Sep 2008)
New Revision: 11889
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
Log:
- Updated dependences.
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-11 13:34:56 UTC (rev 11888)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-11 16:57:54 UTC (rev 11889)
@@ -46,7 +46,7 @@
<componentref name="jboss-portal/modules/test" version="1.0.3"/>
<componentref name="jboss-portal/modules/portlet" version="2.0.3"/>
<componentref name="jboss-portal/modules/identity" version="1.0.4"/>
- <componentref name="jboss-portal/modules/cms" version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/cms" version="1.2.0"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.4"/>
@@ -71,7 +71,7 @@
<componentref name="ehcache" version="1.2.2"/>
<componentref name="el" version="1.0"/>
<componentref name="facelets" version="1.1.15-B1"/>
- <componentref name="richfaces" version="3.2.1.GA"/>
+ <componentref name="richfaces" version="3.2.2.GA"/>
<componentref name="jboss/portlet-bridge" version="1.0.0.B4"/>
<componentref name="hibernate" version="3.2.4.SP1"/>
<componentref name="httpunit" version="1.6"/>
17 years, 8 months
JBoss Portal SVN: r11888 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-11 09:34:56 -0400 (Thu, 11 Sep 2008)
New Revision: 11888
Modified:
branches/JBoss_Portal_Branch_2_7/build/build.xml
branches/JBoss_Portal_Branch_2_7/build/distrib.xml
Log:
Modified build for javadoc
Modified: branches/JBoss_Portal_Branch_2_7/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-09-11 13:32:57 UTC (rev 11887)
+++ branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-09-11 13:34:56 UTC (rev 11888)
@@ -340,13 +340,6 @@
<javadoc destdir="javadoc">
<classpath>
<fileset dir="../thirdparty" includes="**/*.jar"/>
- <fileset dir="../../common/thirdparty" includes="**/*.jar"/>
- <fileset dir="../../common/tools/lib" includes="**/*.jar"/>
- <fileset dir="../../identity/thirdparty" includes="**/*.jar"/>
- <fileset dir="../../portlet/thirdparty" includes="**/*.jar"/>
- <fileset dir="../../test/thirdparty" includes="**/*.jar"/>
- <fileset dir="../../test/test" includes="**/*.jar"/>
- <fileset dir="../../web/thirdparty" includes="**/*.jar"/>
</classpath>
<packageset dir="../server/src/main">
<exclude name="org/jboss/portal/test/**"/>
@@ -406,56 +399,6 @@
<exclude name="org/jboss/portal/test/**"/>
</packageset>
- <!-- Common module -->
- <packageset dir="../../common/common/src/main/java">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../../common/mc/src/main/java">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../../common/portal/src/main/java">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
-
- <!-- Identity module -->
- <packageset dir="../../identity/identity/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../../identity/sso/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
-
- <!-- Portlet module -->
- <packageset dir="../../portlet/bridge/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../../portlet/federation/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../../portlet/jsr168api/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../../portlet/management/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../../portlet/portlet/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../../portlet/test/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
-
- <!-- Test module -->
- <packageset dir="../../test/test/src/main">
- <exclude name="org/jboss/test/**"/>
- </packageset>
-
- <!-- Web module -->
- <packageset dir="../../web/web/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
-
- <link href="/tmp/2.6.2/portlet/build/javadoc" packagelistLoc="/tmp/2.6.2/portlet/build/javadoc"/>
</javadoc>
</target>
Modified: branches/JBoss_Portal_Branch_2_7/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/distrib.xml 2008-09-11 13:32:57 UTC (rev 11887)
+++ branches/JBoss_Portal_Branch_2_7/build/distrib.xml 2008-09-11 13:34:56 UTC (rev 11888)
@@ -89,6 +89,38 @@
<!-- Build JBoss Portal -->
<target name="build" depends="source.build"/>
+ <target name="javadoc">
+ <delete dir="javadoc-bundle"/>
+ <mkdir dir="javadoc-bundle"/>
+ <mkdir dir="javadoc-bundle/core"/>
+ <mkdir dir="javadoc-bundle/core"/>
+ <copy todir="javadoc-bundle/core">
+ <fileset dir="javadoc" includes="**/*"/>
+ </copy>
+ <mkdir dir="javadoc-bundle/cms"/>
+ <copy todir="javadoc-bundle/cms">
+ <fileset dir="../../cms/target/site/apidocs" includes="**/*"/>
+ </copy>
+ <mkdir dir="javadoc-bundle/identity"/>
+ <copy todir="javadoc-bundle/identity">
+ <fileset dir="../../identity/build/javadoc" includes="**/*"/>
+ </copy>
+ <mkdir dir="javadoc-bundle/web"/>
+ <copy todir="javadoc-bundle/web">
+ <fileset dir="../../web/target/site/apidocs" includes="**/*"/>
+ </copy>
+ <mkdir dir="javadoc-bundle/common"/>
+ <copy todir="javadoc-bundle/common">
+ <fileset dir="../../common/target/site/apidocs" includes="**/*"/>
+ </copy>
+ <mkdir dir="javadoc-bundle/portlet"/>
+ <copy todir="javadoc-bundle/portlet">
+ <fileset dir="../../portlet/target/site/apidocs" includes="**/*"/>
+ </copy>
+ <zip destfile="javadoc-bundle/javadoc.zip">
+ <zipfileset prefix="javadoc-jboss-portal" dir="javadoc-bundle"/>
+ </zip>
+ </target>
<!--<macrodef name="package-doc">
<attribute name="todir"/>
@@ -120,9 +152,9 @@
<copy todir="${todir}/userGuide">
<fileset dir="${docs.dir}/userGuide/target/docbook/publish/en-US"/>
</copy>
- <mkdir dir="${todir}/quickstartuser"/>
- <copy todir="${todir}/quickstartuser">
- <fileset dir="${docs.dir}/quickstartuser/target/docbook/publish/en-US"/>
+ <mkdir dir="${todir}/quickstartGuide"/>
+ <copy todir="${todir}/quickstartGuide">
+ <fileset dir="${docs.dir}/quickstartGuide/target/docbook/publish/en-US"/>
</copy>
</sequential>
</target>
17 years, 8 months
JBoss Portal SVN: r11887 - modules/common/trunk.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-11 09:32:57 -0400 (Thu, 11 Sep 2008)
New Revision: 11887
Modified:
modules/common/trunk/pom.xml
Log:
minor
Modified: modules/common/trunk/pom.xml
===================================================================
--- modules/common/trunk/pom.xml 2008-09-11 13:32:51 UTC (rev 11886)
+++ modules/common/trunk/pom.xml 2008-09-11 13:32:57 UTC (rev 11887)
@@ -29,6 +29,17 @@
<module>portal</module>
</modules>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
17 years, 8 months
JBoss Portal SVN: r11886 - modules/portlet/trunk.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-11 09:32:51 -0400 (Thu, 11 Sep 2008)
New Revision: 11886
Modified:
modules/portlet/trunk/pom.xml
Log:
minor
Modified: modules/portlet/trunk/pom.xml
===================================================================
--- modules/portlet/trunk/pom.xml 2008-09-11 13:32:44 UTC (rev 11885)
+++ modules/portlet/trunk/pom.xml 2008-09-11 13:32:51 UTC (rev 11886)
@@ -90,4 +90,17 @@
<modules>
</modules>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+
</project>
17 years, 8 months