[jboss-svn-commits] JBL Code SVN: r34150 - in labs/jbossforums/branches/forums130P27: cache-plugin and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jul 24 11:07:16 EDT 2010
Author: sviluppatorefico
Date: 2010-07-24 11:07:15 -0400 (Sat, 24 Jul 2010)
New Revision: 34150
Removed:
labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/AbstractJBossService.java
Modified:
labs/jbossforums/branches/forums130P27/authz-jaae-plugin/
labs/jbossforums/branches/forums130P27/cache-plugin/
labs/jbossforums/branches/forums130P27/cache-plugin/build.xml
labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/JBossTreeCacheProvider.java
labs/jbossforums/branches/forums130P27/forums/
labs/jbossforums/branches/forums130P27/forums/build.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/application.xml
labs/jbossforums/branches/forums130P27/tools/etc/buildfragments/libraries.ent
Log:
added portal modules so forums don't depend by a jboss portal instance. Remains to pull the identity framework shared with jboss portal
Property changes on: labs/jbossforums/branches/forums130P27/authz-jaae-plugin
___________________________________________________________________
Name: svn:ignore
+ output
Property changes on: labs/jbossforums/branches/forums130P27/cache-plugin
___________________________________________________________________
Name: svn:ignore
+ output
Modified: labs/jbossforums/branches/forums130P27/cache-plugin/build.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/cache-plugin/build.xml 2010-07-23 20:02:46 UTC (rev 34149)
+++ labs/jbossforums/branches/forums130P27/cache-plugin/build.xml 2010-07-24 15:07:15 UTC (rev 34150)
@@ -68,7 +68,8 @@
<!-- Configure thirdparty libraries -->
<call target="configure-libraries"/>
<path id="library.classpath">
- <path refid="jboss.cache.classpath"/>
+ <path refid="jboss.cache.classpath"/>
+ <path refid="jbportal.classpath"/>
<path refid="jgroups.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.hibernate.classpath"/>
Deleted: labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/AbstractJBossService.java
===================================================================
--- labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/AbstractJBossService.java 2010-07-23 20:02:46 UTC (rev 34149)
+++ labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/AbstractJBossService.java 2010-07-24 15:07:15 UTC (rev 34150)
@@ -1,86 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, 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 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portlet.forums.util.cache;
-
-import org.jboss.logging.Logger;
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * JBoss service integration helper.
- *
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @author <a href="mailto:jedim at vige.it">Luca Stancapiano</a>
- * @version $Revision: 8784 $
- */
-public class AbstractJBossService extends ServiceMBeanSupport
-{
-
- public AbstractJBossService()
- {
- }
-
- public AbstractJBossService(final Class type)
- {
- super(type);
- }
-
- public AbstractJBossService(final String category)
- {
- super(category);
- }
-
- public AbstractJBossService(final Logger log)
- {
- super(log);
- }
-
- public final int getState()
- {
- return super.getState();
- }
-
- public final String getStateString()
- {
- return super.getStateString();
- }
-
- public final void create() throws Exception
- {
- super.create();
- }
-
- public final void start() throws Exception
- {
- super.start();
- }
-
- public final void stop()
- {
- super.stop();
- }
-
- public final void destroy()
- {
- super.destroy();
- }
-}
Modified: labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/JBossTreeCacheProvider.java
===================================================================
--- labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/JBossTreeCacheProvider.java 2010-07-23 20:02:46 UTC (rev 34149)
+++ labs/jbossforums/branches/forums130P27/cache-plugin/src/main/org/jboss/portlet/forums/util/cache/JBossTreeCacheProvider.java 2010-07-24 15:07:15 UTC (rev 34150)
@@ -25,6 +25,7 @@
import javax.management.ObjectName;
import org.jboss.cache.TreeCache;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Property changes on: labs/jbossforums/branches/forums130P27/forums
___________________________________________________________________
Name: svn:ignore
+ output
Modified: labs/jbossforums/branches/forums130P27/forums/build.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/build.xml 2010-07-23 20:02:46 UTC (rev 34149)
+++ labs/jbossforums/branches/forums130P27/forums/build.xml 2010-07-24 15:07:15 UTC (rev 34150)
@@ -258,12 +258,13 @@
<copy todir="${build.resources}/portal-forums-ear">
<!--fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/-->
<fileset dir="${jboss.hibernate.search.root}/lib" includes="lucene-core.jar,hibernate-search.jar"/>
- <fileset dir="${jboss.hibernate.lib}" includes="hibernate-commons-annotations.jar,ejb3-persistence.jar"/>
+ <fileset dir="${jboss.hibernate.lib}" includes="hibernate-commons-annotations.jar,ejb3-persistence.jar,ehcache.jar"/>
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums.sar,portal-forums-authz-plugin.sar,portal-forums-uif.jar"/>
<fileset dir="${facelets.lib}" includes="jsf-facelets.jar,jsf-example.jar"/>
<fileset dir="${jakarta.commons.lib}" includes="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.7-brew.jar"/>
<fileset dir="${sun.portlet.lib}" includes="jsf-portlet.jar" />
- <fileset dir="${jbportal.lib}" includes="portletbridge-api.jar,portletbridge-impl.jar" />
+ <fileset dir="${portlet.lib}" includes="portlet-api.jar" />
+ <fileset dir="${jbportal.lib}" includes="portletbridge-api.jar,portletbridge-impl.jar,portal-jems-lib.jar,portal-common-lib.jar,portal-identity-lib.jar" />
</copy>
<jar jarfile="${build.lib}/jboss-forums.ear">
<fileset dir="${build.resources}/portal-forums-ear" includes="**/*"/>
@@ -296,7 +297,8 @@
<fileset dir="${facelets.lib}" includes="jsf-facelets.jar,jsf-example.jar"/>
<fileset dir="${jakarta.commons.lib}" includes="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.7-brew.jar"/>
<fileset dir="${sun.portlet.lib}" includes="jsf-portlet.jar" />
- <fileset dir="${jbportal.lib}" includes="portletbridge-api.jar,portletbridge-impl.jar" />
+ <fileset dir="${portlet.lib}" includes="portlet-api.jar" />
+ <fileset dir="${jbportal.lib}" includes="portletbridge-api.jar,portletbridge-impl.jar,portal-jems-lib.jar,portal-common-lib.jar,portal-identity-lib.jar" />
</copy>
<jar jarfile="${build.lib}/jboss-forums-ha.ear">
<fileset dir="${build.resources}/portal-forums-ha-ear" includes="**/*"/>
@@ -309,7 +311,8 @@
<fileset dir="${facelets.lib}" includes="jsf-facelets.jar,jsf-example.jar"/>
<fileset dir="${jakarta.commons.lib}" includes="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.7-brew.jar"/>
<fileset dir="${sun.portlet.lib}" includes="jsf-portlet.jar" />
- <fileset dir="${jbportal.lib}" includes="portletbridge-api.jar,portletbridge-impl.jar" />
+ <fileset dir="${portlet.lib}" includes="portlet-api.jar" />
+ <fileset dir="${jbportal.lib}" includes="portletbridge-api.jar,portletbridge-impl.jar,portal-jems-lib.jar,portal-common-lib.jar,portal-identity-lib.jar" />
</copy>
<jar jarfile="${build.lib}/jboss-forums-ha-jbp.ear">
<fileset dir="${build.resources}/portal-forums-ha-jbp-ear" includes="**/*"/>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml 2010-07-23 20:02:46 UTC (rev 34149)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml 2010-07-24 15:07:15 UTC (rev 34150)
@@ -43,6 +43,21 @@
<java>portletbridge-impl.jar</java>
</module>
<module>
+ <java>portal-jems-lib.jar</java>
+ </module>
+ <module>
+ <java>portal-common-lib.jar</java>
+ </module>
+ <module>
+ <java>portal-identity-lib.jar</java>
+ </module>
+ <module>
+ <java>ehcache.jar</java>
+ </module>
+ <module>
+ <java>portlet-api.jar</java>
+ </module>
+ <module>
<web>
<web-uri>portal-forums.war</web-uri>
<!--context-root>/forums</context-root-->
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml 2010-07-23 20:02:46 UTC (rev 34149)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml 2010-07-24 15:07:15 UTC (rev 34150)
@@ -29,6 +29,18 @@
<java>portletbridge-impl.jar</java>
</module>
<module>
+ <java>portal-jems-lib.jar</java>
+ </module>
+ <module>
+ <java>portal-common-lib.jar</java>
+ </module>
+ <module>
+ <java>portal-identity-lib.jar</java>
+ </module>
+ <module>
+ <java>portlet-api.jar</java>
+ </module>
+ <module>
<web>
<web-uri>portal-forums.war</web-uri>
<!--context-root>/forums</context-root-->
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/application.xml 2010-07-23 20:02:46 UTC (rev 34149)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-ear/META-INF/application.xml 2010-07-24 15:07:15 UTC (rev 34150)
@@ -29,6 +29,18 @@
<java>portletbridge-impl.jar</java>
</module>
<module>
+ <java>portal-jems-lib.jar</java>
+ </module>
+ <module>
+ <java>portal-common-lib.jar</java>
+ </module>
+ <module>
+ <java>portal-identity-lib.jar</java>
+ </module>
+ <module>
+ <java>portlet-api.jar</java>
+ </module>
+ <module>
<web>
<web-uri>portal-forums.war</web-uri>
<!--context-root>/forums</context-root-->
Modified: labs/jbossforums/branches/forums130P27/tools/etc/buildfragments/libraries.ent
===================================================================
--- labs/jbossforums/branches/forums130P27/tools/etc/buildfragments/libraries.ent 2010-07-23 20:02:46 UTC (rev 34149)
+++ labs/jbossforums/branches/forums130P27/tools/etc/buildfragments/libraries.ent 2010-07-24 15:07:15 UTC (rev 34150)
@@ -187,7 +187,8 @@
portal-api-lib.jar,
portal-faces-lib.jar,
portal-faces-loader-lib.jar,
- portletbridge-api.jar
+ portletbridge-api.jar,
+ portal-identity-lib.jar
"
/>
</path>
More information about the jboss-svn-commits
mailing list