[jboss-svn-commits] JBL Code SVN: r16310 - in labs/jbossforums/branches/forums110P26: forums/src/resources/portal-forums-ear and 11 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sun Nov 4 07:15:44 EST 2007 

Author: dejp
Date: 2007-11-04 07:15:42 -0500 (Sun, 04 Nov 2007)
New Revision: 16310

Added:
   labs/jbossforums/branches/forums110P26/thirdparty/facelets/lib/jsf-example.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/
   labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/
   labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-beanutils.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-codec.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-collections.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-digester-1.6.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-el.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-faces-lib.jar
   labs/jbossforums/branches/forums110P26/thirdparty/sun-portlet/
   labs/jbossforums/branches/forums110P26/thirdparty/sun-portlet/lib/
   labs/jbossforums/branches/forums110P26/thirdparty/sun-portlet/lib/jsf-portlet.jar
Modified:
   labs/jbossforums/branches/forums110P26/forums/build.xml
   labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/META-INF/application.xml
   labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
   labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/jboss-service.xml
   labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/WEB-INF/web.xml
   labs/jbossforums/branches/forums110P26/thirdparty/apache-myfaces/lib/myfaces-api.jar
   labs/jbossforums/branches/forums110P26/thirdparty/apache-myfaces/lib/myfaces-impl.jar
   labs/jbossforums/branches/forums110P26/thirdparty/facelets/lib/jsf-facelets.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/jboss-portlet-api-lib.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-api-lib.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-common-lib.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-core-lib.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-format-lib.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-identity-lib.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-jems-lib.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-portlet-lib.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-server-lib.jar
   labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portlet-api-lib.jar
   labs/jbossforums/branches/forums110P26/tools/etc/buildfragments/libraries.ent
Log:
JBFORUMS-256

Modified: labs/jbossforums/branches/forums110P26/forums/build.xml
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/build.xml	2007-11-04 11:45:19 UTC (rev 16309)
+++ labs/jbossforums/branches/forums110P26/forums/build.xml	2007-11-04 12:15:42 UTC (rev 16310)
@@ -81,7 +81,7 @@
 			<path refid="jboss.hibernate.classpath"/>
 			<path refid="jbportal.classpath"/>			
 	        <path refid="facelets.classpath"/>		
-		<path refid="rome.classpath"/>	
+		<path refid="rome.classpath"/>
 		</path>
 
       <!-- Configure modules -->
@@ -193,9 +193,13 @@
 
       <!-- portal-forums-ui.jar -->
       <jar jarfile="${build.lib}/portal-forums-ui.jar">
-			<fileset dir="${build.classes}"/>
-	  </jar>
+	      <fileset dir="${build.classes}" includes="org/jboss/portlet/forums/auth/*"/>
+      </jar>
 
+      <jar jarfile="${build.lib}/portal-forums-uif.jar">
+	      <fileset dir="${build.classes}" excludes="org/jboss/portlet/forums/auth/*"/>
+      </jar>
+ 
       <!-- portal-forums.war -->
       <jar jarfile="${build.lib}/portal-forums.war" manifest="${build.etc}/portal-forums-war.mf">
 			<fileset dir="${build.resources}/portal-forums-war"/>
@@ -212,10 +216,13 @@
 
       <!-- portal-forums.ear -->
       <copy todir="${build.resources}/portal-forums-ear">
-			<fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/>
+			<!--fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/-->
 			<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums.sar,portal-forums-authz-plugin.sar"/>
-			<!--fileset dir="${facelets.lib}" includes="jsf-facelets.jar,el-api.jar,el-ri.jar"/-->
-			<fileset dir="${apache.myfaces.lib}" includes="tomahawk.jar"/>
+			<fileset dir="${facelets.lib}" includes="jsf-facelets.jar,el-api.jar,el-ri.jar,jsf-example.jar"/>
+			<fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,tomahawk.jar"/>
+			<fileset dir="${jakarta.commons.lib}" includes="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.6.jar,commons-el.jar"/>
+			<fileset dir="${sun.portlet.lib}" includes="jsf-portlet.jar" />
+			<fileset dir="${jbportal.lib}" includes="portal-faces-lib.jar" />
 	  </copy>
 	  <jar jarfile="${build.lib}/jboss-forums.ear">
 			<fileset dir="${build.resources}/portal-forums-ear" includes="**/*"/>

Modified: labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/META-INF/application.xml	2007-11-04 11:45:19 UTC (rev 16309)
+++ labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/META-INF/application.xml	2007-11-04 12:15:42 UTC (rev 16310)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application>
    <display-name>JBoss Forums</display-name>
+   <module>
+           <java>portal-forums-ui.jar</java>
+   </module>
    <module>
-		<java>portal-forums-ui.jar</java>
-   </module>
-   <!--module>
 	   <java>jsf-facelets.jar</java>
    </module>
    <module>
@@ -12,11 +12,11 @@
    </module>
    <module>
 	   <java>el-ri.jar</java>
-   </module-->
+   </module>
    <module>
 	   <java>tomahawk.jar</java>
    </module>
-   <!--module>
+   <module>
 	   <java>myfaces-impl.jar</java>
    </module>
    <module>
@@ -26,12 +26,24 @@
 	   <java>commons-collections.jar</java>
    </module>
    <module>
-	   <java>commons-fileupload.jar</java>
+	   <java>commons-beanutils.jar</java>
    </module>
    <module>
-	   <java>javassist.jar</java>
-   </module>-->
+	   <java>commons-el.jar</java>
+   </module>
    <module>
+	   <java>commons-digester-1.6.jar</java>
+   </module>
+   <module>
+	   <java>commons-codec.jar</java>
+   </module>
+   <module>
+	   <java>portal-faces-lib.jar</java>
+   </module>
+   <module>
+	   <java>jsf-example.jar</java>
+   </module>
+   <module>
       <web>
          <web-uri>portal-forums.war</web-uri>
          <!--context-root>/forums</context-root-->

Modified: labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml	2007-11-04 11:45:19 UTC (rev 16309)
+++ labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml	2007-11-04 12:15:42 UTC (rev 16310)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jboss-app>
-   <!--loader-repository> 
+   <loader-repository> 
          forums.jboss.com:loader=jboss-forums-sar 
       <loader-repository-config>
-         java2ParentDelegation=false 
+         java2ParentDelegation=false
       </loader-repository-config> 
-   </loader-repository-->
+   </loader-repository>
    <module>
 	   <java>portal-forums-ui.jar</java>
    </module>

Modified: labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/jboss-service.xml
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/jboss-service.xml	2007-11-04 11:45:19 UTC (rev 16309)
+++ labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-ear/jboss-service.xml	2007-11-04 12:15:42 UTC (rev 16310)
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>   
-   <!-- hooking in a login module for the standalone version of JSF Forums -->
-    <!-- The custom JAAS login configuration that installs 
-       a Configuration capable of dynamically updating the
-       config settings
-   -->
-   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
-      name="jboss.security.tests:service=LoginConfig">
-      <attribute name="AuthConfig">META-INF/security-config.xml</attribute>
-      <depends optional-attribute-name="LoginConfigService">
-         jboss.security:service=XMLLoginConfig
-      </depends>
-      <depends optional-attribute-name="SecurityManagerService">
-         jboss.security:service=JaasSecurityManager
-      </depends>
-   </mbean>
-</server>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<server>   
+   <!-- hooking in a login module for the standalone version of JSF Forums -->
+    <!-- The custom JAAS login configuration that installs 
+       a Configuration capable of dynamically updating the
+       config settings
+   -->
+   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+      name="jboss.security.tests:service=LoginConfig">
+      <attribute name="AuthConfig">META-INF/security-config.xml</attribute>
+      <depends optional-attribute-name="LoginConfigService">
+         jboss.security:service=XMLLoginConfig
+      </depends>
+      <depends optional-attribute-name="SecurityManagerService">
+         jboss.security:service=JaasSecurityManager
+      </depends>
+   </mbean>
+</server>

Modified: labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/WEB-INF/web.xml
===================================================================
--- labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/WEB-INF/web.xml	2007-11-04 11:45:19 UTC (rev 16309)
+++ labs/jbossforums/branches/forums110P26/forums/src/resources/portal-forums-war/WEB-INF/web.xml	2007-11-04 12:15:42 UTC (rev 16310)
@@ -20,48 +20,53 @@
             See JSF 1.0 PRD2, 10.3.2
         </description>
    </context-param>
-          
+
    <context-param>
+        <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
+        <param-value>true</param-value>
+   </context-param>
+
+   <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
         <param-value>client</param-value>
         <description>
             State saving method: "client" or "server" (= default)
             See JSF Specification 2.5.2
         </description>
-    </context-param>   
-    
-   <context-param>
-        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
-        <param-value>true</param-value>
-        <description>
-			PRETTY_HTML
-        </description>
-    </context-param>
-    
-    <context-param>
-        <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
-        <param-value>true</param-value>
-        <description>
-			ALLOW_JAVASCRIPT
-        </description>
-    </context-param>
-    
-    <context-param>
-        <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
-        <param-value>false</param-value>
-        <description>
-			DETECT_JAVASCRIPT
-        </description>
+    </context-param>   
+    
+   <context-param>
+        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+        <param-value>true</param-value>
+        <description>
+			PRETTY_HTML
+        </description>
     </context-param>
-   
-    <context-param>
-        <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
-        <param-value>false</param-value>
-        <description>
-			AUTO_SCROLL
-        </description>
-    </context-param>   
+    
+    <context-param>
+        <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+        <param-value>true</param-value>
+        <description>
+			ALLOW_JAVASCRIPT
+        </description>
+    </context-param>
+    
+    <context-param>
+        <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+        <param-value>false</param-value>
+        <description>
+			DETECT_JAVASCRIPT
+        </description>
+    </context-param>
    
+    <context-param>
+        <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
+        <param-value>false</param-value>
+        <description>
+			AUTO_SCROLL
+        </description>
+    </context-param>   
+   
    <!-- facelets integration -->
    <!-- Use Documents Saved as *.xhtml -->	
    <context-param>
@@ -154,11 +159,11 @@
    			<description>No roles so no direct access</description>
    		</auth-constraint>
     </security-constraint>
-
-    <listener>
-        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-    </listener>
 
+    <listener>
+        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+    </listener>
+
     <!-- integrating BASIC AUTH for the standalone JSF version -->
     <security-constraint>
       <web-resource-collection>
@@ -176,18 +181,18 @@
    </login-config>
    <security-role>
       <role-name>Authenticated</role-name>
-   </security-role>
-   
+   </security-role>
+   
    <!-- RSS Servlet -->
-	<servlet>
-		<servlet-name>FeedsServlet</servlet-name>
-		<servlet-class>org.jboss.portlet.forums.feeds.FeedsServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>FeedsServlet</servlet-name>
-		<url-pattern>/feeds/*</url-pattern>
+	<servlet>
+		<servlet-name>FeedsServlet</servlet-name>
+		<servlet-class>org.jboss.portlet.forums.feeds.FeedsServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	
+	<servlet-mapping>
+		<servlet-name>FeedsServlet</servlet-name>
+		<url-pattern>/feeds/*</url-pattern>
 	</servlet-mapping>
 </web-app>
 

Modified: labs/jbossforums/branches/forums110P26/thirdparty/apache-myfaces/lib/myfaces-api.jar
===================================================================
(Binary files differ)

Modified: labs/jbossforums/branches/forums110P26/thirdparty/apache-myfaces/lib/myfaces-impl.jar
===================================================================
(Binary files differ)

Added: labs/jbossforums/branches/forums110P26/thirdparty/facelets/lib/jsf-example.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossforums/branches/forums110P26/thirdparty/facelets/lib/jsf-example.jar
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbossforums/branches/forums110P26/thirdparty/facelets/lib/jsf-facelets.jar
===================================================================
(Binary files differ)

Added: labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-beanutils.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-beanutils.jar
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-codec.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-codec.jar
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-collections.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-collections.jar
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-digester-1.6.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-digester-1.6.jar
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-el.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossforums/branches/forums110P26/thirdparty/jakarta-commons/lib/commons-el.jar
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/jboss-portlet-api-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-api-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-common-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-core-lib.jar
===================================================================
(Binary files differ)

Added: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-faces-lib.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-faces-lib.jar
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-format-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-identity-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-jems-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-portlet-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portal-server-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbossforums/branches/forums110P26/thirdparty/jbportal/lib/portlet-api-lib.jar
===================================================================
(Binary files differ)

Added: labs/jbossforums/branches/forums110P26/thirdparty/sun-portlet/lib/jsf-portlet.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossforums/branches/forums110P26/thirdparty/sun-portlet/lib/jsf-portlet.jar
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbossforums/branches/forums110P26/tools/etc/buildfragments/libraries.ent
===================================================================
--- labs/jbossforums/branches/forums110P26/tools/etc/buildfragments/libraries.ent	2007-11-04 11:45:19 UTC (rev 16309)
+++ labs/jbossforums/branches/forums110P26/tools/etc/buildfragments/libraries.ent	2007-11-04 12:15:42 UTC (rev 16310)
@@ -122,7 +122,7 @@
   <property name="facelets.root" value="${project.thirdparty}/facelets"/>
   <property name="facelets.lib" value="${facelets.root}/lib"/>
   <path id="facelets.classpath">
-    <filelist dir="${facelets.lib}" files="jsf-facelets.jar,el-api.jar,el-ri.jar"/>
+    <filelist dir="${facelets.lib}" files="jsf-facelets.jar,el-api.jar,el-ri.jar,jsf-example.jar"/>
   </path>
 
   <!-- Hibernate -->
@@ -151,7 +151,8 @@
 		portal-jems-lib.jar,
 		jboss-portlet-api-lib.jar,
 		portal-core-test-lib.jar,
-		portal-api-lib.jar
+		portal-api-lib.jar,
+		portal-faces-lib.jar
 		"
    />
   </path>
@@ -183,4 +184,19 @@
   <path id="jdom.classpath">
     <filelist dir="${jdom.lib}" files="jdom.jar"/>
   </path>
+
+  <!-- Jakarta commons -->
+  <property name="jakarta.commons.root" value="${project.thirdparty}/jakarta-commons"/>
+  <property name="jakarta.commons.lib" value="${jakarta.commons.root}/lib"/>
+  <path id="jakarta.commons.classpath">
+    <filelist dir="${commons.lib}" files="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.6.jar,commons-el.jar"/>
+  </path>
+
+  <!-- Sun portlet -->
+  <property name="sun.portlet.root" value="${project.thirdparty}/sun-portlet"/>
+  <property name="sun.portlet.lib" value="${sun.portlet.root}/lib"/>
+  <path id="sun.portlet.classpath">
+    <filelist dir="${sun.portlet.lib}" files="jsf-portlet.jar"/>
+  </path>
+
 </target>

More information about the jboss-svn-commits mailing list