JBoss Portal SVN: r9317 - branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2007-12-06 17:36:55 -0500 (Thu, 06 Dec 2007)
New Revision: 9317
Modified:
branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java
Log:
JBPORTAL-1839 - problem with deployment of clustered portal
Modified: branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java 2007-12-06 17:09:54 UTC (rev 9316)
+++ branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java 2007-12-06 22:36:55 UTC (rev 9317)
@@ -26,6 +26,7 @@
import org.hibernate.cache.Cache;
import org.hibernate.cache.CacheException;
import org.hibernate.cache.CacheProvider;
+import org.hibernate.cache.OptimisticTreeCache;
import org.hibernate.cache.TreeCache;
import org.jboss.mx.util.MBeanProxy;
import org.jboss.mx.util.MBeanServerLocator;
@@ -63,7 +64,21 @@
MBeanServer server = MBeanServerLocator.locateJBoss();
TreeCacheProvider provider = (TreeCacheProvider)MBeanProxy.get(TreeCacheProvider.class, providerName, server);
org.jboss.cache.TreeCache cache = provider.getTreeCache();
- return new TreeCache(cache, regionName, cache.getTransactionManager());
+
+ //Select the proper type of hibernate cache to be used
+ Cache hibernateCache = null;
+ if(cache.getNodeLockingScheme().equalsIgnoreCase("OPTIMISTIC"))
+ {
+ log.debug("Selecting Optimistic Cache");
+ hibernateCache = new OptimisticTreeCache(cache, regionName);
+ }
+ else
+ {
+ log.debug("Selecting regular Tree Cache");
+ hibernateCache = new TreeCache(cache, regionName, cache.getTransactionManager());
+ }
+
+ return hibernateCache;
}
catch (Exception e)
{
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r9316 - demo/trunk/portlets/jbosswiki.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-06 12:09:54 -0500 (Thu, 06 Dec 2007)
New Revision: 9316
Added:
demo/trunk/portlets/jbosswiki/wiki.ear
Log:
Wiki portlet storing in /tmp/foo :(
Added: demo/trunk/portlets/jbosswiki/wiki.ear
===================================================================
(Binary files differ)
Property changes on: demo/trunk/portlets/jbosswiki/wiki.ear
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r9315 - in demo/trunk: portlets/jbosswiki and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-06 12:08:56 -0500 (Thu, 06 Dec 2007)
New Revision: 9315
Added:
demo/trunk/portlets/jbosswiki/wiki-common.jar
Modified:
demo/trunk/build.xml
Log:
Wiki portlet storing in /tmp/foo :(
Modified: demo/trunk/build.xml
===================================================================
--- demo/trunk/build.xml 2007-12-06 16:52:03 UTC (rev 9314)
+++ demo/trunk/build.xml 2007-12-06 17:08:56 UTC (rev 9315)
@@ -105,8 +105,10 @@
<target name="install-jbosswiki">
+ <mkdir dir="${tmp.dir}/jbosswiki"/>
+ <explode file="portlets/jbosswiki/wiki.ear" todir="${tmp.dir}/jbosswiki"/>
<copy todir="${destination.dir}/${portal.name.dir}/server/default/deploy">
- <fileset dir="portlets/jbosswiki"/>
+ <fileset dir="${tmp.dir}/jbosswiki"/>
</copy>
</target>
@@ -134,7 +136,7 @@
<target name="main"
depends="unzip-bundle, delete-docs, configure-jboss, configure-identity, delete-objectsdescriptors, delete-wsrpdescriptors,
- update-context,install-objectsdescriptor, install-wsrpdescriptor, install-jbossforums, activate-workflow, default-cms-content">
+ update-context,install-objectsdescriptor, install-wsrpdescriptor, install-jbossforums, install-jbosswiki, activate-workflow, default-cms-content">
<tar destfile="${destination.dir}/${portal.name.dir}.tgz" basedir="${destination.dir}" includes="${portal.name.dir}/**" longfile="gnu" compression="gzip"/>
</target>
Added: demo/trunk/portlets/jbosswiki/wiki-common.jar
===================================================================
(Binary files differ)
Property changes on: demo/trunk/portlets/jbosswiki/wiki-common.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r9314 - demo/trunk/portlets/jbosswiki.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-06 11:52:03 -0500 (Thu, 06 Dec 2007)
New Revision: 9314
Removed:
demo/trunk/portlets/jbosswiki/wiki.ear/
Log:
delete this
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r9313 - in demo/trunk: conf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-06 11:35:42 -0500 (Thu, 06 Dec 2007)
New Revision: 9313
Modified:
demo/trunk/build.xml
demo/trunk/conf/default-object.xml
Log:
JBoss Forums ++
Modified: demo/trunk/build.xml
===================================================================
--- demo/trunk/build.xml 2007-12-06 15:59:09 UTC (rev 9312)
+++ demo/trunk/build.xml 2007-12-06 16:35:42 UTC (rev 9313)
@@ -16,6 +16,10 @@
classname="org.jboss.portal.common.ant.Implode"
classpathref="implode.task.classpath"/>
+ <taskdef name="explode"
+ classname="org.jboss.portal.common.ant.Explode"
+ classpathref="implode.task.classpath"/>
+
</target>
<target name="unzip-bundle" depends="init">
@@ -91,9 +95,12 @@
-->
<target name="install-jbossforums">
+ <mkdir dir="${tmp.dir}/jbossforums"/>
+ <explode file="portlets/jbossforums/jboss-forums.ear" todir="${tmp.dir}/jbossforums"/>
<copy todir="${destination.dir}/${portal.name.dir}/server/default/deploy">
- <fileset dir="portlets/jbossforums"/>
+ <fileset dir="${tmp.dir}/jbossforums"/>
</copy>
+ <delete file="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-forums.ear/portal-forums.war/WEB-INF/forums-object.xml"/>
</target>
Modified: demo/trunk/conf/default-object.xml
===================================================================
--- demo/trunk/conf/default-object.xml 2007-12-06 15:59:09 UTC (rev 9312)
+++ demo/trunk/conf/default-object.xml 2007-12-06 16:35:42 UTC (rev 9313)
@@ -113,156 +113,184 @@
</context>
</deployment>
<deployment>
- <parent-ref/>
- <if-exists>keep</if-exists>
- <portal>
- <portal-name>default</portal-name>
- <supported-modes>
- <mode>view</mode>
- <mode>edit</mode>
- <mode>help</mode>
- </supported-modes>
- <supported-window-states>
- <window-state>normal</window-state>
- <window-state>minimized</window-state>
- <window-state>maximized</window-state>
- </supported-window-states>
- <security-constraint>
- <policy-permission>
- <action-name>viewrecursive</action-name>
- <action-name>personalizerecursive</action-name>
- <unchecked/>
- </policy-permission>
- </security-constraint>
- <page>
- <page-name>default</page-name>
- <properties>
- <property>
- <name>order</name>
- <value>1</value>
- </property>
- <property>
- <name>layout.id</name>
- <value>generic</value>
- </property>
- </properties>
- <window>
- <window-name>CMSWindow</window-name>
- <content>
- <content-type>cms</content-type>
- <content-uri>/default/index.html</content-uri>
- </content>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>CMSLoginWindow</window-name>
- <content>
- <content-type>cms</content-type>
- <content-uri>/default/login.html</content-uri>
- </content>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>IdentityUserPortletWindow</window-name>
- <instance-ref>IdentityUserPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>CurrentUsersPortletWindow</window-name>
- <instance-ref>CurrentUsersPortletInstance</instance-ref>
- <region>left</region>
- <height>1</height>
- </window>
- </page>
- <page>
- <page-name>Widgets</page-name>
- <properties>
- <property>
- <name>order</name>
- <value>3</value>
- </property>
- <property>
- <name>layout.id</name>
- <value>3columns</value>
- </property>
- </properties>
- <window>
- <window-name>CMSWidgetWindow</window-name>
- <content>
- <content-type>cms</content-type>
- <content-uri>/default/widgets.html</content-uri>
- </content>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>DateTimeGWidgetWindow</window-name>
- <content>
- <content-type>widget/google</content-type>
- <content-uri>http://www.google.com/ig/modules/datetime.xml</content-uri>
- </content>
- <region>right</region>
- <height>0</height>
- <properties>
- <property>
+ <parent-ref />
+ <if-exists>keep</if-exists>
+ <portal>
+ <portal-name>default</portal-name>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
+ <security-constraint>
+ <policy-permission>
+ <action-name>viewrecursive</action-name>
+ <action-name>personalizerecursive</action-name>
+ <unchecked />
+ </policy-permission>
+ </security-constraint>
+ <page>
+ <page-name>default</page-name>
+ <properties>
+ <property>
+ <name>order</name>
+ <value>1</value>
+ </property>
+ <property>
+ <name>layout.id</name>
+ <value>generic</value>
+ </property>
+ </properties>
+ <window>
+ <window-name>CMSWindow</window-name>
+ <content>
+ <content-type>cms</content-type>
+ <content-uri>/default/index.html</content-uri>
+ </content>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CMSLoginWindow</window-name>
+ <content>
+ <content-type>cms</content-type>
+ <content-uri>/default/login.html</content-uri>
+ </content>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>IdentityUserPortletWindow</window-name>
+ <instance-ref>
+ IdentityUserPortletInstance
+ </instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CurrentUsersPortletWindow</window-name>
+ <instance-ref>
+ CurrentUsersPortletInstance
+ </instance-ref>
+ <region>left</region>
+ <height>1</height>
+ </window>
+ </page>
+ <page>
+ <page-name>Widgets</page-name>
+ <properties>
+ <property>
+ <name>order</name>
+ <value>3</value>
+ </property>
+ <property>
+ <name>layout.id</name>
+ <value>3columns</value>
+ </property>
+ </properties>
+ <window>
+ <window-name>CMSWidgetWindow</window-name>
+ <content>
+ <content-type>cms</content-type>
+ <content-uri>/default/widgets.html</content-uri>
+ </content>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>DateTimeGWidgetWindow</window-name>
+ <content>
+ <content-type>widget/google</content-type>
+ <content-uri>
+ http://www.google.com/ig/modules/datetime.xml
+ </content-uri>
+ </content>
+ <region>right</region>
+ <height>0</height>
+ <properties>
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
+ </window>
+ <window>
+ <window-name>FunnyCatGWidgetWindow</window-name>
+ <content>
+ <content-type>widget/google</content-type>
+ <content-uri>
+ http://blog.esaba.com/projects/catphotos/catphotos.xml
+ </content-uri>
+ </content>
+ <region>center</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>BejeweledGWidgetWindow</window-name>
+ <content>
+ <content-type>widget/google</content-type>
+ <content-uri>
+ http://bejeweledg.googlecode.com/svn/trunk/bejeweled.xml
+ </content-uri>
+ </content>
+ <region>left</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>TVGuideNWidgetWindow</window-name>
+ <content>
+ <content-type>widget/netvibes</content-type>
+ <content-uri>
+ http://nvmodules.typhon.net/ben/tv.php
+ </content-uri>
+ </content>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ </page>
+ <page>
+ <page-name>Samples</page-name>
+ <properties>
+ <property>
+ <name>order</name>
+ <value>2</value>
+ </property>
+ </properties>
+ <window>
+ <window-name>NewsPortletWindow</window-name>
+ <instance-ref>NewsPortletInstance</instance-ref>
+ <region>center</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>WeatherPortletWindow</window-name>
+ <instance-ref>WeatherPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ </page>
+ <page>
+ <page-name>Forums</page-name>
+ <window>
+ <window-name>JBossForumsWindow</window-name>
+ <instance-ref>JBossForumsInstance</instance-ref>
+ <properties>
+ <property>
<name>theme.renderSetId</name>
<value>emptyRenderer</value>
- </property>
- </properties>
- </window>
- <window>
- <window-name>FunnyCatGWidgetWindow</window-name>
- <content>
- <content-type>widget/google</content-type>
- <content-uri>http://blog.esaba.com/projects/catphotos/catphotos.xml</content-uri>
- </content>
- <region>center</region>
- <height>1</height>
- </window>
- <window>
- <window-name>BejeweledGWidgetWindow</window-name>
- <content>
- <content-type>widget/google</content-type>
- <content-uri>http://bejeweledg.googlecode.com/svn/trunk/bejeweled.xml</content-uri>
- </content>
- <region>left</region>
- <height>1</height>
- </window>
- <window>
- <window-name>TVGuideNWidgetWindow</window-name>
- <content>
- <content-type>widget/netvibes</content-type>
- <content-uri>http://nvmodules.typhon.net/ben/tv.php</content-uri>
- </content>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
- <page>
- <page-name>Samples</page-name>
- <properties>
- <property>
- <name>order</name>
- <value>2</value>
- </property>
- </properties>
- <window>
- <window-name>NewsPortletWindow</window-name>
- <instance-ref>NewsPortletInstance</instance-ref>
- <region>center</region>
- <height>1</height>
- </window>
- <window>
- <window-name>WeatherPortletWindow</window-name>
- <instance-ref>WeatherPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- </page>
- </portal>
+ </property>
+ </properties>
+ <region>center</region>
+ <initial-window-state>maximized</initial-window-state>
+ <height>0</height>
+ </window>
+ </page>
+ </portal>
</deployment>
<deployment>
<if-exists>keep</if-exists>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r9312 - in demo/trunk: conf and 11 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-06 10:59:09 -0500 (Thu, 06 Dec 2007)
New Revision: 9312
Added:
demo/trunk/Readme.txt
demo/trunk/conf/core-cms/default-content/
demo/trunk/conf/core-cms/default-content/default/
demo/trunk/conf/core-cms/default-content/default/images/
demo/trunk/conf/core-cms/default-content/default/images/homeimg_main.png
demo/trunk/conf/core-cms/default-content/default/index.html
demo/trunk/conf/core-cms/default-content/default/login.html
demo/trunk/conf/core-cms/default-content/default/widgets.html
demo/trunk/conf/core-identity/
demo/trunk/conf/core-identity/identity-ui-configuration.xml.diff
demo/trunk/conf/core-identity/portlet.xml.diff
demo/trunk/conf/jboss-log4j.xml
demo/trunk/lib/
demo/trunk/lib/explode.jar
demo/trunk/portlets/jbosswiki/
demo/trunk/portlets/jbosswiki/wiki.ear/
demo/trunk/portlets/jbosswiki/wiki.ear/JBossORG-EULA.txt
demo/trunk/portlets/jbosswiki/wiki.ear/META-INF/
demo/trunk/portlets/jbosswiki/wiki.ear/META-INF/MANIFEST.MF
demo/trunk/portlets/jbosswiki/wiki.ear/META-INF/application.xml
demo/trunk/portlets/jbosswiki/wiki.ear/wiki-common.jar
demo/trunk/portlets/jbosswiki/wiki.ear/wiki-test.war
demo/trunk/portlets/jbosswiki/wiki.ear/wiki.ejb3
demo/trunk/portlets/jbosswiki/wiki.ear/wiki.war
Removed:
demo/trunk/bin/
demo/trunk/conf/log4j.xml
demo/trunk/portlets/flickrportlet/
Modified:
demo/trunk/build.properties
demo/trunk/build.xml
demo/trunk/conf/default-object.xml
demo/trunk/conf/demo-wsrp.xml
demo/trunk/portlets/jbossforums/jboss-forums.ear
Log:
Update demo
Added: demo/trunk/Readme.txt
===================================================================
--- demo/trunk/Readme.txt (rev 0)
+++ demo/trunk/Readme.txt 2007-12-06 15:59:09 UTC (rev 9312)
@@ -0,0 +1,21 @@
+
+
+
+Upload:
+=======
+
+1 - Copy the produced tgz on the demo box:
+theute$ scp jboss-portal-x.y.z.GA.tgz theute@portal.demo.jboss.com:/services/demoportal
+
+2 - Shutdown the running portal
+theute$ sudo /etc/init.d/demoportal stop
+
+3 - Extract the tgz
+theute$ sudo su - demoportal
+demoportal$ tar zxvf jboss-portal-x.y.z.GA.tgz
+
+4 - Update the link
+demoportal$ ln -s jboss-portal-x.y.z jboss
+
+5 - Start the server again
+theute$ sudo /etc/init.d/demoportal start
\ No newline at end of file
Modified: demo/trunk/build.properties
===================================================================
--- demo/trunk/build.properties 2007-12-06 13:31:42 UTC (rev 9311)
+++ demo/trunk/build.properties 2007-12-06 15:59:09 UTC (rev 9312)
@@ -1,10 +1,8 @@
# Location of the JBoss Portal + 4.0.5 AS bundle
-portal.bundle.url=/home/theute/Downloads/jboss-portal-2.6.1.GA-bundled.zip
+portal.bundle.url=/home/theute/Portal/workspace_2.6/demo/jboss-portal-2.6.3-bundled.zip
# Name used as top directory in the bundle
-portal.name.dir=jboss-portal-2.6.1.GA
+portal.name.dir=jboss-portal-2.6.3
# Where to create the demo website and associated tgz file
destination.dir=/home/theute/Portal/demoWebsite
-# Which WS to use. (keep this to use the one embedded here)
-jbossws.location=./bin/jbossws-1.2.1.GA.zip
# Where to put temporary files during the construction of the portal demo
tmp.dir=/tmp
Modified: demo/trunk/build.xml
===================================================================
--- demo/trunk/build.xml 2007-12-06 13:31:42 UTC (rev 9311)
+++ demo/trunk/build.xml 2007-12-06 15:59:09 UTC (rev 9312)
@@ -5,6 +5,17 @@
<target name="init">
<mkdir dir="${destination.dir}"/>
+
+ <mkdir dir="${destination.dir}/deploy"/>
+
+ <path id="implode.task.classpath">
+ <pathelement location="lib/explode.jar"/>
+ </path>
+
+ <taskdef name="implode"
+ classname="org.jboss.portal.common.ant.Implode"
+ classpathref="implode.task.classpath"/>
+
</target>
<target name="unzip-bundle" depends="init">
@@ -13,7 +24,7 @@
<target name="configure-jboss" depends="delete-jmxconsole">
<!-- Modify logging -->
- <copy overwrite="true" file="conf/log4j.xml" todir="${destination.dir}/${portal.name.dir}/server/default/conf"/>
+ <copy overwrite="true" file="conf/jboss-log4j.xml" todir="${destination.dir}/${portal.name.dir}/server/default/conf"/>
<!-- Modify access-log for portal.demo.jboss.com -->
<patch patchfile="conf/server.xml.diff" originalfile="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-web.deployer/server.xml"/>
<!-- Add deploy directory -->
@@ -65,6 +76,7 @@
<patch patchfile="conf/jboss-web.xml.diff" originalfile="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml"/>
</target>
+ <!--
<target name="install-flickrportlet">
<unwar src="portlets/flickrportlet/flickrportlet.war" dest="${tmp.dir}/flickrportlet"/>
<delete file="${tmp.dir}/flickrportlet/WEB-INF/sun-web.xml"/>
@@ -76,35 +88,47 @@
<fileset dir="${tmp.dir}/flickrportlet"/>
</copy>
</target>
+ -->
<target name="install-jbossforums">
- <copy todir="${destination.dir}/jboss-portal-2.6/server/default/deploy">
+ <copy todir="${destination.dir}/${portal.name.dir}/server/default/deploy">
<fileset dir="portlets/jbossforums"/>
</copy>
</target>
- <!-- Fix WS issues on JBoss 4.0.x -->
- <!--target name="update-ws">
- <unzip src="${jbossws.location}" dest="${tmp.dir}/jbossws"/>
- <ant inheritAll="false" dir="${tmp.dir}/jbossws" antfile="build.xml" target="deploy-jboss40-jdk14">
- <property name="jboss40.home" value="${destination.dir}/${portal.name.dir}"/>
- <property name="jboss.server.instance" value="default"/>
- </ant>
- </target-->
+
+ <target name="install-jbosswiki">
+ <copy todir="${destination.dir}/${portal.name.dir}/server/default/deploy">
+ <fileset dir="portlets/jbosswiki"/>
+ </copy>
+ </target>
+ <target name="default-cms-content">
+ <delete dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content/"/>
+ <mkdir dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content"/>
+ <copy todir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content">
+ <fileset dir="conf/core-cms/default-content"/>
+ </copy>
+ </target>
+
<target name="activate-workflow">
- <copy todir="${destination.dir}/jboss-portal-2.6/server/default/deploy/jboss-portal.sar/portal-cms.sar/META-INF">
+ <copy todir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-cms.sar/META-INF">
<fileset file="conf/core-cms/jboss-service.xml"/>
</copy>
</target>
+
+ <target name="configure-identity">
+ <!-- Enable Captcha -->
+ <patch patchfile="conf/core-identity/portlet.xml.diff" originalfile="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-identity.sar/portal-identity.war/WEB-INF/portlet.xml"/>
+ <!-- Give Admin role to new users -->
+ <patch patchfile="conf/core-identity/identity-ui-configuration.xml.diff" originalfile="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-identity.sar/conf/identity-ui-configuration.xml"/>
+ </target>
+
<target name="main"
- depends="unzip-bundle, delete-docs, configure-jboss, delete-objectsdescriptors, delete-wsrpdescriptors,
- update-context,install-objectsdescriptor, install-wsrpdescriptor, install-jbossforums, activate-workflow">
- <tar destfile="${destination.dir}/${portal.name.dir}.tar" basedir="${destination.dir}/${portal.name.dir}"
- longfile="gnu"/>
- <gzip zipfile="${destination.dir}/${portal.name.dir}.tgz" src="${destination.dir}/${portal.name.dir}.tar"/>
- <delete file="${destination.dir}/${portal.name.dir}.tar"/>
+ depends="unzip-bundle, delete-docs, configure-jboss, configure-identity, delete-objectsdescriptors, delete-wsrpdescriptors,
+ update-context,install-objectsdescriptor, install-wsrpdescriptor, install-jbossforums, activate-workflow, default-cms-content">
+ <tar destfile="${destination.dir}/${portal.name.dir}.tgz" basedir="${destination.dir}" includes="${portal.name.dir}/**" longfile="gnu" compression="gzip"/>
</target>
</project>
\ No newline at end of file
Added: demo/trunk/conf/core-cms/default-content/default/images/homeimg_main.png
===================================================================
(Binary files differ)
Property changes on: demo/trunk/conf/core-cms/default-content/default/images/homeimg_main.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: demo/trunk/conf/core-cms/default-content/default/index.html
===================================================================
--- demo/trunk/conf/core-cms/default-content/default/index.html (rev 0)
+++ demo/trunk/conf/core-cms/default-content/default/index.html 2007-12-06 15:59:09 UTC (rev 9312)
@@ -0,0 +1,34 @@
+<div align="center"><img src="/content/default/images/homeimg_main.png" border="0" width="560" height="160" /></div>
+<table border="0" cellspacing="2" cellpadding="2">
+ <tr>
+ <td align="center"><a href="http://portal.demo.jboss.com" target="_blank"><img
+ src="/portal-jsp-samples/images/dodemo.gif" border="0"
+ alt="Try the latest release of JBoss Portal, live and online."></a>
+ <a href="http://labs.jboss.com/portal/jbossportal/download/index.html" target="_blank"><img
+ src="/portal-jsp-samples/images/getcode.gif" border="0"
+ alt="Download JBoss Portal and have it up and running in minutes."></a>
+
+ <a href="http://www.portletswap.com" target="_blank"><img
+ src="/portal-jsp-samples/images/accessorize.gif" border="0"
+ alt="Download portlets and layouts for your new JBoss Portal installation."></a></td>
+ </tr>
+ <tr>
+ <td></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate">
+ <font class="portlet-font">This is the demo portal based on <b>JBoss Portal 2.6.3-GA</b>. You may
+ log in at any time, using the <i>Login</i> link at the top-right of this page.</font>
+ </td>
+ </tr>
+ <tr>
+ <td>Note: Since anybody can have admin access, this demo box is restarted with fresh data several times
+ a day and will not answer during the reboot process</td>
+ </tr>
+ <tr>
+ <td align="center">
+ If you are in need of guidance with regards to navigating, configuring, or operating the portal, please view
+ our <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">online documentation</a>.
+ </td>
+ </tr>
+</table>
\ No newline at end of file
Added: demo/trunk/conf/core-cms/default-content/default/login.html
===================================================================
--- demo/trunk/conf/core-cms/default-content/default/login.html (rev 0)
+++ demo/trunk/conf/core-cms/default-content/default/login.html 2007-12-06 15:59:09 UTC (rev 9312)
@@ -0,0 +1,10 @@
+<h3>Credentials</h3>
+<p>To access the portal as a simple user, please use:
+<ul>
+ <li>username: user</li>
+ <li>password: user</li>
+</ul>
+</p>
+<p>To access the portal with <b>full administrator rights</b>, please <b>register</b>.
+The data are not kept and for your own security please do not use a real email address or
+any valuable password.</p>
Added: demo/trunk/conf/core-cms/default-content/default/widgets.html
===================================================================
--- demo/trunk/conf/core-cms/default-content/default/widgets.html (rev 0)
+++ demo/trunk/conf/core-cms/default-content/default/widgets.html 2007-12-06 15:59:09 UTC (rev 9312)
@@ -0,0 +1,3 @@
+<h3>Widgets integration</h3>
+<p>Here you will find several widgets either from <a target="_blank" href="http://www.google.com/ig">iGoogle</a> or <a target="_blank" href="http://eco.netvibes.com">Netvibes (UWA widgets only)</a>.
+Also please note that those widgets come from various people around the world and may or may not work.</p>
\ No newline at end of file
Added: demo/trunk/conf/core-identity/identity-ui-configuration.xml.diff
===================================================================
--- demo/trunk/conf/core-identity/identity-ui-configuration.xml.diff (rev 0)
+++ demo/trunk/conf/core-identity/identity-ui-configuration.xml.diff 2007-12-06 15:59:09 UTC (rev 9312)
@@ -0,0 +1,17 @@
+--- identity-ui-configuration.xml 2007-12-05 18:08:48.000000000 +0100
++++ identity-ui-configuration.xml 2007-12-06 15:42:05.000000000 +0100
+@@ -52,6 +52,7 @@
+ -->
+ <default-roles>
+ <role>User</role>
++ <role>Admin</role>
+ </default-roles>
+
+ <!-- user interface components -->
+@@ -143,4 +144,4 @@
+ <required>true</required>
+ </ui-component>
+ </ui-components>
+-</identity-ui-configuration>
+\ No newline at end of file
++</identity-ui-configuration>
Added: demo/trunk/conf/core-identity/portlet.xml.diff
===================================================================
--- demo/trunk/conf/core-identity/portlet.xml.diff (rev 0)
+++ demo/trunk/conf/core-identity/portlet.xml.diff 2007-12-06 15:59:09 UTC (rev 9312)
@@ -0,0 +1,11 @@
+--- portlet.xml 2007-09-27 18:38:32.000000000 +0200
++++ portlet.xml 2007-10-01 15:32:50.000000000 +0200
+@@ -50,7 +50,7 @@
+ <preference>
+ <!-- Use captcha verification -->
+ <name>captcha</name>
+- <value>false</value>
++ <value>true</value>
+ </preference>
+ <preference>
+ <!--
Modified: demo/trunk/conf/default-object.xml
===================================================================
--- demo/trunk/conf/default-object.xml 2007-12-06 13:31:42 UTC (rev 9311)
+++ demo/trunk/conf/default-object.xml 2007-12-06 15:59:09 UTC (rev 9312)
@@ -141,14 +141,12 @@
<name>order</name>
<value>1</value>
</property>
+ <property>
+ <name>layout.id</name>
+ <value>generic</value>
+ </property>
</properties>
<window>
- <window-name>JSPPortletWindow</window-name>
- <instance-ref>JSPPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
<window-name>CMSWindow</window-name>
<content>
<content-type>cms</content-type>
@@ -158,26 +156,99 @@
<height>0</height>
</window>
<window>
- <window-name>UserPortletWindow</window-name>
- <instance-ref>UserPortletInstance</instance-ref>
+ <window-name>CMSLoginWindow</window-name>
+ <content>
+ <content-type>cms</content-type>
+ <content-uri>/default/login.html</content-uri>
+ </content>
<region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>IdentityUserPortletWindow</window-name>
+ <instance-ref>IdentityUserPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CurrentUsersPortletWindow</window-name>
+ <instance-ref>CurrentUsersPortletInstance</instance-ref>
+ <region>left</region>
<height>1</height>
</window>
</page>
<page>
- <page-name>Samples</page-name>
+ <page-name>Widgets</page-name>
<properties>
<property>
<name>order</name>
- <value>2</value>
+ <value>3</value>
</property>
+ <property>
+ <name>layout.id</name>
+ <value>3columns</value>
+ </property>
</properties>
<window>
- <window-name>FlickrPortletWindow</window-name>
- <instance-ref>FlickrPortletInstance</instance-ref>
+ <window-name>CMSWidgetWindow</window-name>
+ <content>
+ <content-type>cms</content-type>
+ <content-uri>/default/widgets.html</content-uri>
+ </content>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>DateTimeGWidgetWindow</window-name>
+ <content>
+ <content-type>widget/google</content-type>
+ <content-uri>http://www.google.com/ig/modules/datetime.xml</content-uri>
+ </content>
+ <region>right</region>
+ <height>0</height>
+ <properties>
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
+ </window>
+ <window>
+ <window-name>FunnyCatGWidgetWindow</window-name>
+ <content>
+ <content-type>widget/google</content-type>
+ <content-uri>http://blog.esaba.com/projects/catphotos/catphotos.xml</content-uri>
+ </content>
<region>center</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>BejeweledGWidgetWindow</window-name>
+ <content>
+ <content-type>widget/google</content-type>
+ <content-uri>http://bejeweledg.googlecode.com/svn/trunk/bejeweled.xml</content-uri>
+ </content>
+ <region>left</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>TVGuideNWidgetWindow</window-name>
+ <content>
+ <content-type>widget/netvibes</content-type>
+ <content-uri>http://nvmodules.typhon.net/ben/tv.php</content-uri>
+ </content>
+ <region>center</region>
<height>0</height>
</window>
+ </page>
+ <page>
+ <page-name>Samples</page-name>
+ <properties>
+ <property>
+ <name>order</name>
+ <value>2</value>
+ </property>
+ </properties>
<window>
<window-name>NewsPortletWindow</window-name>
<instance-ref>NewsPortletInstance</instance-ref>
@@ -330,8 +401,8 @@
<height>0</height>
</window>
<window>
- <window-name>UserPortletWindow</window-name>
- <instance-ref>UserPortletInstance</instance-ref>
+ <window-name>IdentityUserPortletWindow</window-name>
+ <instance-ref>IdentityUserPortletInstance</instance-ref>
<region>left</region>
<height>1</height>
</window>
@@ -366,41 +437,90 @@
<instance-ref>AdminPortletInstance</instance-ref>
<region>center</region>
<height>0</height>
+ <properties>
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
</window>
+ <properties>
+ <property>
+ <name>layout.id</name>
+ <value>1column</value>
+ </property>
+ </properties>
</page>
<page>
<page-name>Members</page-name>
<window>
- <window-name>UserPortletWindow</window-name>
- <instance-ref>UserPortletInstance</instance-ref>
+ <window-name>IdentityAdminPortletWindow</window-name>
+ <instance-ref>IdentityAdminPortletInstance</instance-ref>
<region>center</region>
<height>0</height>
+ <properties>
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
</window>
- <window>
- <window-name>RolePortletWindow</window-name>
- <instance-ref>RolePortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
+ <properties>
+ <property>
+ <name>layout.id</name>
+ <value>1column</value>
+ </property>
+ </properties>
</page>
<page>
- <page-name>CMS</page-name>
- <window>
- <window-name>CMSAdminPortletWindow</window-name>
- <instance-ref>CMSAdminPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
+ <page-name>CMS</page-name>
+ <window>
+ <window-name>CMSAdminPortletWindow</window-name>
+ <instance-ref>CMSAdminPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ <properties>
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
+ </window>
+ <properties>
+ <property>
+ <name>layout.id</name>
+ <value>1column</value>
+ </property>
+ </properties>
</page>
<page>
- <page-name>WSRP</page-name>
- <window>
- <window-name>WSRPConsumersConfigurationPortletWindow</window-name>
- <instance-ref>WSRPConsumersConfigurationPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
+ <page-name>WSRP</page-name>
+ <security-constraint>
+ <policy-permission>
+ <action-name>viewrecursive</action-name>
+ <role-name>Admin</role-name>
+ </policy-permission>
+ </security-constraint>
+ <properties>
+ <property>
+ <name>layout.id</name>
+ <value>1column</value>
+ </property>
+ </properties>
+ <window>
+ <window-name>WSRPConsumersConfigurationPortletWindow</window-name>
+ <instance-ref>WSRPConsumersConfigurationPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ <properties>
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
+ </window>
</page>
+
</portal>
</deployment>
</deployments>
Modified: demo/trunk/conf/demo-wsrp.xml
===================================================================
--- demo/trunk/conf/demo-wsrp.xml 2007-12-06 13:31:42 UTC (rev 9311)
+++ demo/trunk/conf/demo-wsrp.xml 2007-12-06 15:59:09 UTC (rev 9312)
@@ -34,10 +34,10 @@
immediate attempt to access the web service description which is not available yet at this point of deployment
-->
<endpoint-config>
- <service-description-url>http://portal.demo.jboss.com:8080/portal-wsrp/ServiceDescriptionService</service-description-url>
- <markup-url>http://portal.demo.jboss.com:8080/portal-wsrp/MarkupService</markup-url>
- <registration-url>http://portal.demo.jboss.com:8080/portal-wsrp/RegistrationService</registration-url>
- <portlet-management-url>http://portal.demo.jboss.com:8080/portal-wsrp/PortletManagementService</portlet-management-url>
+ <service-description-url>http://portal.demo.jboss.com/portal-wsrp/ServiceDescriptionService</service-description-url>
+ <markup-url>http://portal.demo.jboss.com/portal-wsrp/MarkupService</markup-url>
+ <registration-url>http://portal.demo.jboss.com/portal-wsrp/RegistrationService</registration-url>
+ <portlet-management-url>http://portal.demo.jboss.com/portal-wsrp/PortletManagementService</portlet-management-url>
</endpoint-config>
<registration-data/>
</wsrp-producer>
Copied: demo/trunk/conf/jboss-log4j.xml (from rev 8458, demo/trunk/conf/log4j.xml)
===================================================================
--- demo/trunk/conf/jboss-log4j.xml (rev 0)
+++ demo/trunk/conf/jboss-log4j.xml 2007-12-06 15:59:09 UTC (rev 9312)
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 56612 2006-09-07 15:12:39Z thomas.diesler(a)jboss.com $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- A size based file rolling appender
+ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ====================== -->
+ <!-- More Appender examples -->
+ <!-- ====================== -->
+
+ <!-- Buffer events and log them asynchronously
+ <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <appender-ref ref="FILE"/>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="SMTP"/>
+ </appender>
+ -->
+
+ <!-- EMail events to an administrator
+ <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="To" value="admin(a)myhost.domain.com"/>
+ <param name="From" value="nobody(a)myhost.domain.com"/>
+ <param name="Subject" value="JBoss Sever Errors"/>
+ <param name="SMTPHost" value="localhost"/>
+ <param name="BufferSize" value="10"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Syslog events
+ <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Facility" value="LOCAL7"/>
+ <param name="FacilityPrinting" value="true"/>
+ <param name="SyslogHost" value="localhost"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Log events to JMS (requires a topic to be created)
+ <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+ <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+ </appender>
+ -->
+
+ <!-- Log events through SNMP
+ <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
+ <param name="ManagementHost" value="127.0.0.1"/>
+ <param name="ManagementHostTrapListenPort" value="162"/>
+ <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
+ <param name="LocalIPAddress" value="127.0.0.1"/>
+ <param name="LocalTrapSendPort" value="161"/>
+ <param name="GenericTrapType" value="6"/>
+ <param name="SpecificTrapType" value="12345678"/>
+ <param name="CommunityString" value="public"/>
+ <param name="ForwardStackTraceWithTrap" value="true"/>
+ <param name="Threshold" value="DEBUG"/>
+ <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Emit events as JMX notifications
+ <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+
+ <param name="Threshold" value="WARN"/>
+ <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
+ <category name="org.jboss.serial">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+ <category name="org.jgroups">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+ <category name="jacorb">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- Limit other crap categories -->
+ <category name="org.jtb">
+ <priority value="INFO"/>
+ </category>
+ <category name="httpclient">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit Hibernate categories -->
+ <category name="org.hibernate">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- Limit JBoss categories -->
+ <category name="org.jboss">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- Limit ehcache categories -->
+ <category name="net.sf.ehcache">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- Limit JBPM categories -->
+ <category name="org.jbpm">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- Limit the JSR77 categories -->
+ <category name="org.jboss.management">
+ <priority value="ERROR"/>
+ </category>
+
+ <!-- Enable JBossWS message tracing
+ <category name="jbossws.SOAPMessage">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!-- Decrease the priority threshold for the org.jboss.varia category
+ <category name="org.jboss.varia">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
+ <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!--
+ | An example of enabling the custom TRACE level priority that is used
+ | by the JBoss internals to diagnose low level details. This example
+ | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+ | subpackages. This will produce A LOT of logging output.
+ <category name="org.jboss.system">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ <category name="org.jboss.ejb.plugins">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!--
+ | Logs these events to SNMP:
+ - server starts/stops
+ - cluster evolution (node death/startup)
+ - When an EJB archive is deployed (and associated verified messages)
+ - When an EAR archive is deployed
+
+ <category name="org.jboss.system.server.Server">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.deployment.MainDeployer">
+ <priority value="ERROR" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.ejb.EJBDeployer">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.deployment.EARDeployer">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="FILE"/>
+ </root>
+
+ <!-- Clustering logging -->
+ <!-- Uncomment the following to redirect the org.jgroups and
+ org.jboss.ha categories to a cluster.log file.
+
+ <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ <category name="org.jgroups">
+ <priority value="DEBUG" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+ <category name="org.jboss.ha">
+ <priority value="DEBUG" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+ -->
+
+</log4j:configuration>
Deleted: demo/trunk/conf/log4j.xml
===================================================================
--- demo/trunk/conf/log4j.xml 2007-12-06 13:31:42 UTC (rev 9311)
+++ demo/trunk/conf/log4j.xml 2007-12-06 15:59:09 UTC (rev 9312)
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml 56612 2006-09-07 15:12:39Z thomas.diesler(a)jboss.com $ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/server.log"/>
- <param name="Append" value="false"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <!-- Rollover at the top of each hour
- <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
- -->
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A size based file rolling appender
- <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/server.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ====================== -->
- <!-- More Appender examples -->
- <!-- ====================== -->
-
- <!-- Buffer events and log them asynchronously
- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <appender-ref ref="FILE"/>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="SMTP"/>
- </appender>
- -->
-
- <!-- EMail events to an administrator
- <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Threshold" value="ERROR"/>
- <param name="To" value="admin(a)myhost.domain.com"/>
- <param name="From" value="nobody(a)myhost.domain.com"/>
- <param name="Subject" value="JBoss Sever Errors"/>
- <param name="SMTPHost" value="localhost"/>
- <param name="BufferSize" value="10"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Syslog events
- <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Facility" value="LOCAL7"/>
- <param name="FacilityPrinting" value="true"/>
- <param name="SyslogHost" value="localhost"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Log events to JMS (requires a topic to be created)
- <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Threshold" value="ERROR"/>
- <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
- <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
- </appender>
- -->
-
- <!-- Log events through SNMP
- <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
- <param name="ManagementHost" value="127.0.0.1"/>
- <param name="ManagementHostTrapListenPort" value="162"/>
- <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
- <param name="LocalIPAddress" value="127.0.0.1"/>
- <param name="LocalTrapSendPort" value="161"/>
- <param name="GenericTrapType" value="6"/>
- <param name="SpecificTrapType" value="12345678"/>
- <param name="CommunityString" value="public"/>
- <param name="ForwardStackTraceWithTrap" value="true"/>
- <param name="Threshold" value="DEBUG"/>
- <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- Emit events as JMX notifications
- <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-
- <param name="Threshold" value="WARN"/>
- <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
- </layout>
- </appender>
- -->
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
- <category name="org.apache">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
- <category name="org.jboss.serial">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
- <category name="org.jgroups">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the jacorb category to WARN as its INFO is verbose -->
- <category name="jacorb">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit other crap categories -->
- <category name="org.jtb">
- <priority value="INFO"/>
- </category>
- <category name="httpclient">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit Hibernate categories -->
- <category name="org.hibernate">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit JBoss categories -->
- <category name="org.jboss">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit ehcache categories -->
- <category name="net.sf.ehcache">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit JBPM categories -->
- <category name="org.jbpm">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the JSR77 categories -->
- <category name="org.jboss.management">
- <priority value="INFO"/>
- </category>
-
- <!-- Enable JBossWS message tracing
- <category name="jbossws.SOAPMessage">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- Decrease the priority threshold for the org.jboss.varia category
- <category name="org.jboss.varia">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
- <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!--
- | An example of enabling the custom TRACE level priority that is used
- | by the JBoss internals to diagnose low level details. This example
- | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
- | subpackages. This will produce A LOT of logging output.
- <category name="org.jboss.system">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- <category name="org.jboss.ejb.plugins">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!--
- | Logs these events to SNMP:
- - server starts/stops
- - cluster evolution (node death/startup)
- - When an EJB archive is deployed (and associated verified messages)
- - When an EAR archive is deployed
-
- <category name="org.jboss.system.server.Server">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.deployment.MainDeployer">
- <priority value="ERROR" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.ejb.EJBDeployer">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- <category name="org.jboss.deployment.EARDeployer">
- <priority value="INFO" />
- <appender-ref ref="TRAP_LOG"/>
- </category>
-
- -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
- <!-- Clustering logging -->
- <!-- Uncomment the following to redirect the org.jgroups and
- org.jboss.ha categories to a cluster.log file.
-
- <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- <category name="org.jgroups">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- <category name="org.jboss.ha">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- -->
-
-</log4j:configuration>
Added: demo/trunk/lib/explode.jar
===================================================================
(Binary files differ)
Property changes on: demo/trunk/lib/explode.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: demo/trunk/portlets/jbossforums/jboss-forums.ear
===================================================================
(Binary files differ)
Added: demo/trunk/portlets/jbosswiki/wiki.ear/JBossORG-EULA.txt
===================================================================
--- demo/trunk/portlets/jbosswiki/wiki.ear/JBossORG-EULA.txt (rev 0)
+++ demo/trunk/portlets/jbosswiki/wiki.ear/JBossORG-EULA.txt 2007-12-06 15:59:09 UTC (rev 9312)
@@ -0,0 +1,107 @@
+LICENSE AGREEMENT
+JBOSS(r)
+
+This License Agreement governs the use of the Software Packages and any updates to the Software
+Packages, regardless of the delivery mechanism. Each Software Package is a collective work
+under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
+the user ("Client") a license to the applicable collective work(s) pursuant to the
+GNU Lesser General Public License v. 2.1 except for the following Software Packages:
+(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
+GNU General Public License v.2;
+
+(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
+
+(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
+(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
+it may purchase a license from Sleepycat Software);
+
+and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
+and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
+royalty-free patent licenses.
+
+Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
+
+1. The Software. "Software Packages" refer to the various software modules that are created and made available
+for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
+may be comprised of hundreds of software components. The end user license agreement for each component is located in
+the component's source code. With the exception of certain image files identified in Section 2 below,
+the license terms for the components permit Client to copy, modify, and redistribute the component,
+in both source code and binary code forms. This agreement does not limit Client's rights under,
+or grant Client rights that supersede, the license terms of any particular component.
+
+2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
+and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
+remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
+individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
+in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
+using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
+trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
+these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
+If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
+http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.
+Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
+
+3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
+component, to the maximum extent permitted under applicable law, the Software Packages and the
+components are provided and licensed "as is" without warranty of any kind, expressed or implied,
+including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
+Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
+materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
+Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
+or that the operation of the Software Packages will be entirely error free or appear precisely as described
+in the accompanying documentation. This warranty extends only to the party that purchases the Services
+pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
+described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
+exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
+delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
+refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
+Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
+damages, including lost profits or lost savings arising out of the use or inability to use the Software,
+even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
+Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
+Agreement during the twelve months preceding the action.
+
+5. Export Control. As required by U.S. law, Client represents and warrants that it:
+(a) understands that the Software Packages are subject to export controls under the
+U.S. Commerce Department's Export Administration Regulations ("EAR");
+
+(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
+(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
+
+(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
+or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
+
+(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
+biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
+regulation or specific license;
+
+(e) understands and agrees that if it is in the United States and exports or transfers the Software
+Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
+reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
+address (including country) of each transferee;
+
+and (f) understands that countries other than the United States may restrict the import, use, or
+export of encryption products and that it shall be solely responsible for compliance with any such
+import, use, or export restrictions.
+
+6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
+that are not part of the Software Packages and which Client must install separately. These third party
+programs are subject to their own license terms. The license terms either accompany the programs or
+can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
+license terms for such programs, then Client may not install them. If Client wishes to install the programs
+on more than one system or transfer the programs to another party, then Client must contact the licensor
+of the programs.
+
+7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
+enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
+State of North Carolina and of the United States, without regard to any conflict of laws provisions,
+except that the United Nations Convention on the International Sale of Goods shall not apply.
+
+Copyright 2006 Red Hat, Inc. All rights reserved.
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
+
+ Page 1 of 1 18 October 2006
+
Added: demo/trunk/portlets/jbosswiki/wiki.ear/META-INF/MANIFEST.MF
===================================================================
--- demo/trunk/portlets/jbosswiki/wiki.ear/META-INF/MANIFEST.MF (rev 0)
+++ demo/trunk/portlets/jbosswiki/wiki.ear/META-INF/MANIFEST.MF 2007-12-06 15:59:09 UTC (rev 9312)
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.5.3
+Created-By: 1.5.0_07-87 ("Apple Computer, Inc.")
+Built-By: tomaszszymanski
+
+Name:
+Specification-Title: jbosswiki
+Specification-Version: 1.0
+Specification-Vendor: Tomasz Szymanski
+Implementation-Title:
+Implementation-Version: 1.0
+Implementation-Vendor: Tomasz Szymanski
+
Added: demo/trunk/portlets/jbosswiki/wiki.ear/META-INF/application.xml
===================================================================
--- demo/trunk/portlets/jbosswiki/wiki.ear/META-INF/application.xml (rev 0)
+++ demo/trunk/portlets/jbosswiki/wiki.ear/META-INF/application.xml 2007-12-06 15:59:09 UTC (rev 9312)
@@ -0,0 +1,16 @@
+<application>
+ <display-name>JBoss Labs - forge infrastructure</display-name>
+ <module>
+ <ejb>wiki.ejb3</ejb>
+ </module>
+ <module>
+ <web>
+ <web-uri>wiki.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
+ <web-uri>wiki-test.war</web-uri>
+ </web>
+ </module>
+</application>
Added: demo/trunk/portlets/jbosswiki/wiki.ear/wiki-common.jar
===================================================================
(Binary files differ)
Property changes on: demo/trunk/portlets/jbosswiki/wiki.ear/wiki-common.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: demo/trunk/portlets/jbosswiki/wiki.ear/wiki-test.war
===================================================================
(Binary files differ)
Property changes on: demo/trunk/portlets/jbosswiki/wiki.ear/wiki-test.war
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: demo/trunk/portlets/jbosswiki/wiki.ear/wiki.ejb3
===================================================================
(Binary files differ)
Property changes on: demo/trunk/portlets/jbosswiki/wiki.ear/wiki.ejb3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: demo/trunk/portlets/jbosswiki/wiki.ear/wiki.war
===================================================================
(Binary files differ)
Property changes on: demo/trunk/portlets/jbosswiki/wiki.ear/wiki.war
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r9311 - tags/JBoss_Portal_2_6_3/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-06 08:31:42 -0500 (Thu, 06 Dec 2007)
New Revision: 9311
Modified:
tags/JBoss_Portal_2_6_3/build/distrib.xml
Log:
To be consistent
Modified: tags/JBoss_Portal_2_6_3/build/distrib.xml
===================================================================
--- tags/JBoss_Portal_2_6_3/build/distrib.xml 2007-12-06 06:10:01 UTC (rev 9310)
+++ tags/JBoss_Portal_2_6_3/build/distrib.xml 2007-12-06 13:31:42 UTC (rev 9311)
@@ -2,7 +2,7 @@
<property name="source.dir" value="../../jboss-portal-2.6"/>
<property name="docs.dir" value="${source.dir}-docs"/>
- <property name="release.version" value="2.6.3"/>
+ <property name="release.version" value="2.6.3.GA"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r9310 - tags/JBoss_Portal_2_6_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-06 01:10:01 -0500 (Thu, 06 Dec 2007)
New Revision: 9310
Modified:
tags/JBoss_Portal_2_6_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
Log:
JBPORTAL-1838: Erasing local registration confirmation screen now properly goes back to the configuration screen. Exception is expected.
--This line, and those below, will be 1ignored--
M core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
Modified: tags/JBoss_Portal_2_6_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- tags/JBoss_Portal_2_6_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2007-12-06 05:16:19 UTC (rev 9309)
+++ tags/JBoss_Portal_2_6_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2007-12-06 06:10:01 UTC (rev 9310)
@@ -416,7 +416,7 @@
if (consumer != null)
{
getProducerInfo().eraseRegistrationInfo();
- return null;
+ return ConsumerManagerBean.CONFIGURE_CONSUMER;
}
beanContext.createErrorMessage("Couldn't erase local Registration!");
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r9309 - docs/tags/JBoss_Portal_2_6_3/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-12-06 00:16:19 -0500 (Thu, 06 Dec 2007)
New Revision: 9309
Modified:
docs/tags/JBoss_Portal_2_6_3/referenceGuide/en/modules/wsrp.xml
Log:
- Removed some leftover content from previous versions.
- IDEA messed up the layout: fixed some tags being attached to previous word (need to go through the document again).
Modified: docs/tags/JBoss_Portal_2_6_3/referenceGuide/en/modules/wsrp.xml
===================================================================
--- docs/tags/JBoss_Portal_2_6_3/referenceGuide/en/modules/wsrp.xml 2007-12-06 05:15:49 UTC (rev 9308)
+++ docs/tags/JBoss_Portal_2_6_3/referenceGuide/en/modules/wsrp.xml 2007-12-06 05:16:19 UTC (rev 9309)
@@ -35,20 +35,15 @@
<para>More information on WSRP can be found on the
<ulink url="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsrp">official website for WSRP</ulink>.
- We suggest reading the
- <ulink
- url="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsrp">primer
- </ulink>
- for a good, albeit technical, overview of WSRP.
+ We suggest reading the <ulink url="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsrp">primer
+ </ulink> for a good, albeit technical, overview of WSRP.
</para>
</sect1>
<sect1 id="wsrp_support">
<title>Level of support in JBoss Portal</title>
<para>The WSRP Technical Committee defined
- <ulink url="http://www.oasis-open.org/committees/download.php/3073">WSRP
- Use Profiles
- </ulink>
+ <ulink url="http://www.oasis-open.org/committees/download.php/3073">WSRP Use Profiles</ulink>
to help with WSRP interoperability. We will refer to terms defined in that document in
this section.
</para>
@@ -72,8 +67,7 @@
<para>While we provide a complete implementation of WSRP 1.0, we do need to go through the
<ulink url="http://www.oasis-open.org/committees/download.php/6018">Conformance statements</ulink>
- and
- perform more interoperability testing (an area that needs to be better supported by the WSRP Technical
+ and perform more interoperability testing (an area that needs to be better supported by the WSRP Technical
Committee and Community at large).
</para>
</sect1>
@@ -81,19 +75,11 @@
<sect1>
<title>Deploying JBoss Portal's WSRP services</title>
<para>
- JBoss Portal provides a complete support of WSRP 1.0 standard interfaces and offers
- both consumer and producer services. WSRP support is provided by the
- <filename>portal-wsrp.sar</filename>
- service archive, included in the main
- <filename>jboss-portal.sar</filename>
- service archive, if you've
- obtained JBoss Portal from a binary distribution. If you don't intend on using WSRP, we recommend that you
- remove
- <filename>portal-wspr.sar</filename>
- from the main
- <filename>jboss-portal.sar</filename>
- service
- archive.
+ JBoss Portal provides a complete support of WSRP 1.0 standard interfaces and offers both consumer and producer
+ services. WSRP support is provided by the <filename>portal-wsrp.sar</filename> service archive, included in
+ the main <filename>jboss-portal.sar</filename> service archive, if you've obtained JBoss Portal from a binary
+ distribution. If you don't intend on using WSRP, we recommend that you remove <filename>portal-wspr.sar</filename>
+ from the main <filename>jboss-portal.sar</filename> service archive.
</para>
<para>If you've obtained the source distribution of JBoss Portal, you need to build and deploy the WSRP service
separately. Please follow the instructions on how to install
@@ -133,7 +119,7 @@
<sect1>
<title>Making a portlet remotable</title>
- <para>JBoss Portal does<emphasis role="bold">NOT</emphasis>, by default, expose local portlets for consumption by
+ <para>JBoss Portal does <emphasis role="bold">NOT</emphasis>, by default, expose local portlets for consumption by
remote WSRP
consumers. In order to make a portlet remotely available, it must be made "remotable" by adding a
<literal>remotable</literal>
@@ -196,19 +182,12 @@
<para>
In the example above, we defined two portlets with a default "remotable" status set to true. This means that
all portlets defined in this descriptor are, by default, exposed remotely by JBoss Portal's WSRP producer.
- Note, however, that it is possible to override the default behavior by adding a
- <literal>remotable</literal>
+ Note, however, that it is possible to override the default behavior by adding a <literal>remotable</literal>
element to a portlet description. In that case, the "remotable" status defined by the portlet takes precedence
- over the default. In the example above, the
- <varname>RemotelyExposedPortlet</varname>
- inherits the "remotable"
- status defined by default since it does not specify a
- <literal>remotable</literal>
- element in its description.
- The<varname>NotRemotelyExposedPortlet</varname>, however, overrides the default behavior and is not remotely
- exposed. Note that in the absence of a top-level
- <literal>remotable</literal>
- element, portlets are NOT
+ over the default. In the example above, the <varname>RemotelyExposedPortlet</varname> inherits the "remotable"
+ status defined by default since it does not specify a <literal>remotable</literal> element in its description.
+ The <varname>NotRemotelyExposedPortlet</varname>, however, overrides the default behavior and is not remotely
+ exposed. Note that in the absence of a top-level <literal>remotable</literal> element, portlets are NOT
remotely exposed.
</para>
</sect1>
@@ -218,7 +197,7 @@
<para>WSRP Consumers vary a lot as far as how they are configured. Most of them require that you either specify
the URL for the Producer's WSDL definition or the URLs for the individual endpoints. Please refer to your
Consumer's documentation for specific instructions. For instructions on how to do so in JBoss Portal, please
- refer to<xref linkend="consumer_configuration"/>.
+ refer to <xref linkend="consumer_configuration"/>.
</para>
<para>
JBoss Portal's Producer is automatically set up when you deploy a portal instance with the WSRP service.
@@ -239,9 +218,7 @@
<filename>http://{hostname}:{port}/portal-wsrp/PortletManagementService</filename>
</listitem>
</itemizedlist>
- The default hostname is
- <literal>localhost</literal>
- and the default port is 8080.
+ The default hostname is <literal>localhost</literal> and the default port is 8080.
</para>
</sect1>
@@ -305,8 +282,7 @@
be up to date and refreshing it from the remote Producer might be a good idea. This can happen for
several reasons: the service description for that remote Producer has not been fetched yet, the cached
version has expired or modifications have been made to the configuration that could potentially
- invalidate
- it, thus requiring re-validation of the information.
+ invalidate it, thus requiring re-validation of the information.
</para>
<para>
@@ -320,7 +296,7 @@
</mediaobject>
You should now see a form allowing you to enter/modify the information about the Consumer.
Set the cache expiration value to 300 seconds and enter the WSDL URL for the producer in the text field
- and press the "Save & Refresh" button:
+ and press the "Refresh & Save" button:
<mediaobject>
<imageobject>
<imagedata fileref="images/wsrp/config_usewsdl.png" format="png" align="center" valign="middle"/>
@@ -329,7 +305,7 @@
This will retrieve the service description associated with the Producer which WSRP is described by the
WSDL file found at the URL you just entered. In our case, querying the service description will allow us
to learn that the Producer requires registration and that it expects a value for the registration
- property named<literal>registration/consumerRole</literal>:
+ property named <literal>registration/consumerRole</literal>:
<mediaobject>
<imageobject>
<imagedata fileref="images/wsrp/config_refresh.png" format="png" align="center" valign="middle"/>
@@ -348,16 +324,13 @@
<imagedata fileref="images/wsrp/config_end.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
- The Consumer for the
- <literal>bea</literal>
- Producer should now be available as a portlet provider and
+ The Consumer for the <literal>bea</literal> Producer should now be available as a portlet provider and
is ready to be used.
</para>
<para>
A producer is configured, by default, by retrieving the producer's information via a WSDL URL. There are
rare cases, however, where URLs need to be provided for each of the producer's end points. You can do
- exactly that by unchecking the "Use WSDL?" checkbox, as is the case for the
- <literal>self</literal>
+ exactly that by unchecking the "Use WSDL?" checkbox, as is the case for the <literal>self</literal>
producer:
<mediaobject>
<imageobject>
@@ -370,9 +343,7 @@
<sect3>
<title>Using a WSRP Producer XML descriptor</title>
- <para>We will create a
- <filename>public-bea-wsrp.xml</filename>
- descriptor. Note that the actual name does not
+ <para>We will create a <filename>public-bea-wsrp.xml</filename> descriptor. Note that the actual name does not
matter as long as it ends with<filename>-wsrp.xml</filename>:
<example>
<programlisting><![CDATA[
@@ -396,9 +367,7 @@
</example>
This producer descriptor gives access to BEA's public WSRP producer. We will look at the details of the
- different elements later. Note for now the
- <literal>producer-id</literal>
- element with a
+ different elements later. Note for now the <literal>producer-id</literal> element with a
"<literal>bea</literal>" value. Put this file in the deploy directory and start the server (with JBoss
Portal and its WSRP service deployed).
</para>
@@ -440,8 +409,7 @@
From there on out, you should be able to configure WSRP portlets just as any other. In particular, you
can create an instance of one of the remote portlets offered by BEA's public producer just like you would
create an instance of a local portlet and then assign it to a window in a page. If you go to that page,
- you
- should see something similar to below for this portlet:
+ you should see something similar to below for this portlet:
<mediaobject>
<imageobject>
<imagedata fileref="images/wsrp/result.png" format="png" align="center" valign="middle"/>
@@ -455,15 +423,13 @@
<title>WSRP Producer descriptors</title>
<para>
- A WSRP Producer descriptor is an XML file which name ends in
- <filename>-wsrp.xml</filename>
- and
+ A WSRP Producer descriptor is an XML file which name ends in <filename>-wsrp.xml</filename> and
which can be dropped in the deploy directory of the JBoss application server or nested in .sar files. It is
possible to configure access to several different producers within a single descriptor or use one file per
producer, depending on your needs. The DTD for the WSRP Producer descriptor format can be found at
<filename>portal-wsrp.sar/dtd/jboss-wsrp-consumer_2_6.dtd</filename>.
- TODO: REPLACE WITH REFERENCE TO SCHEMA INSTEAD.
+ <!--TODO: REPLACE WITH REFERENCE TO SCHEMA INSTEAD.-->
<note>It is important to note how WSRP Producer descriptors are processed. They are read the first time the
WSRP service starts and the associated information is then put in the Portal database. Subsequent launch
@@ -473,11 +439,10 @@
producer in the database will be used. If a producer identifier is found that wasn't already in the
database, that producer information will be processed and recorded in the database. Therefore, if you
wish to delete a producer configuration, you need to delete the associated information in the database
- (this can be accomplished using the configuration portlet as we saw in<xref linkend="consumer_gui"/>)
- <emphasis>AND</emphasis>
- remove the associated information in any
- WSRP Producer descriptor (if such information exists) as the producer will be re-created the next time
- the WSRP is launched if that information is not removed.
+ (this can be accomplished using the configuration portlet as we saw in <xref linkend="consumer_gui"/>)
+ <emphasis>AND</emphasis> remove the associated information in any WSRP Producer descriptor (if such
+ information exists) as the producer will be re-created the next time the WSRP is launched if that
+ information is not removed.
</note>
</para>
@@ -525,10 +490,8 @@
to the remote WSRP services.
<note>It is important to note that, when using this method, JBoss Portal will try to match a port
name to an interface based solely on the provided name. There are no standard names for these
- ports
- so it is possible (though rare) that this matching process fails. In this case, you should look
- at
- the WSDL file and provide the endpoint URLs manually, as per the previous method.
+ ports so it is possible (though rare) that this matching process fails. In this case, you should
+ look at the WSDL file and provide the endpoint URLs manually, as per the previous method.
</note>
</listitem>
</itemizedlist>
@@ -569,13 +532,11 @@
</para>
<para>Additionally, some producers require consumers to register with them before authorizing them to access
- their offered portlets. If you know that information beforehand, you can provide the required
- registration
+ their offered portlets. If you know that information beforehand, you can provide the required registration
information in the producer configuration so that the Portal consumer can register with the remote
producer when required.
<note>At this time, though, only simple String properties are supported and it is not possible to
- configure
- complex registration data. This should however be sufficient for most cases.
+ configure complex registration data. This should however be sufficient for most cases.
</note>
</para>
@@ -603,11 +564,8 @@
<title>Examples</title>
<para>
- Here is the configuration of the
- <literal>self</literal>
- producer as found in
- <filename>default-wsrp.xml</filename>
- with a cache expiring every five minutes:
+ Here is the configuration of the <literal>self</literal> producer as found in
+ <filename>default-wsrp.xml</filename> with a cache expiring every five minutes:
</para>
<example>
@@ -644,8 +602,7 @@
</example>
<para>Here is an example of a WSRP descriptor with a 2 minute caching time and manual definition of the
- endpoint
- URLs:
+ endpoint URLs:
</para>
<example>
@@ -726,13 +683,9 @@
If you recall, the producer was requiring registration and required a value to be provided for the
<literal>registration/consumerRole</literal>
property. The description of that property indicated that
- three values were possible:<literal>public</literal>,
- <literal>partner</literal>
- or
- <literal>insider</literal>
- each corresponding to a different service level. We registered using the
- <literal>public</literal>
- service level. This gave us access to three portlets as shown here:
+ three values were possible: <literal>public</literal>, <literal>partner</literal> or
+ <literal>insider</literal> each corresponding to a different service level. We registered using the
+ <literal>public</literal> service level. This gave us access to three portlets as shown here:
<mediaobject>
<imageobject>
<imagedata fileref="images/wsrp/bea.png" format="png" align="center" valign="middle"/>
@@ -743,13 +696,8 @@
Suppose now that we would like to upgrade our service level to the "insider" level. We will need to
tell BEA's producer that our registration data has been modified. Let's see how to do this. Assuming you
have configured access to the producer as previously described, please go to the configuration screen for
- the
- <literal>bea</literal>
- producer and modify the value of the
- <literal>registration/consumerRole</literal>
- to
- <literal>insider</literal>
- instead of<literal>public</literal>:
+ the <literal>bea</literal> producer and modify the value of the <literal>registration/consumerRole</literal>
+ to <literal>insider</literal> instead of <literal>public</literal>:
<mediaobject>
<imageobject>
<imagedata fileref="images/wsrp/modify_reg_start.png" format="png" align="center" valign="middle"/>
@@ -770,9 +718,7 @@
<imagedata fileref="images/wsrp/modify_reg_end.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
- You can now check the list of available portlets from the
- <literal>bea</literal>
- provider and verify that
+ You can now check the list of available portlets from the <literal>bea</literal> provider and verify that
new portlets are now available:
<mediaobject>
<imageobject>
@@ -790,9 +736,7 @@
It can also happen that a producer administrator decided to require more information from registered
consumers. In this case, invoking operations on the producer will fail with an
<exceptionname>OperationFailedFault</exceptionname>. JBoss Portal will attempt to help you in this
- situation. Let's walk through an example using the
- <literal>self</literal>
- producer. Let's assume that
+ situation. Let's walk through an example using the <literal>self</literal> producer. Let's assume that
registration is required without any registration properties (as is the case by default). If you go to
the configuration screen for this producer, you should see:
<mediaobject>
@@ -802,9 +746,8 @@
</mediaobject>
Now suppose that the administrator of the producer now requires a value to be provided for an
- <literal>email</literal>
- registration property. We will actually see how to do perform this operation
- in JBoss Portal when we examine how to configure Portal's producer in<xref linkend="producer_config"/>.
+ <literal>email</literal> registration property. We will actually see how to do perform this operation
+ in JBoss Portal when we examine how to configure Portal's producer in <xref linkend="producer_config"/>.
Operations with this producer will now fail. If you suspect that a registration modification is required,
you should go to the configuration screen for this remote producer and refresh the information held by
the consumer by pressing "Refresh & Save":
@@ -815,9 +758,7 @@
</mediaobject>
As you can see, the configuration screen now shows the currently held registration information and
- the expected information from the producer. Enter a value for the
- <literal>email</literal>
- property
+ the expected information from the producer. Enter a value for the <literal>email</literal> property
and then click on "Modify registration". If all went well and the producer accepted your new registration
data, you should see something similar to:
<mediaobject>
@@ -828,11 +769,9 @@
</mediaobject>
<note>As of WSRP 1, it is rather difficult to ascertain for sure what caused an
- <exceptionname>OperationFailedFault</exceptionname>
- as it is the generic exception returned by
+ <exceptionname>OperationFailedFault</exceptionname> as it is the generic exception returned by
producers if something didn't quite happen as expected during a method invocation. This means that
- <exceptionname>OperationFailedFault</exceptionname>
- can be caused by several different reasons, one
+ <exceptionname>OperationFailedFault</exceptionname> can be caused by several different reasons, one
of them being a request to modify the registration data. Please take a look at the log files to see
if you can gather more information as to what happened. WSRP 2 introduces an exception that is
specific to a request to modify registrations thus reducing the ambiguity that currently exists.
@@ -906,9 +845,7 @@
<title>Overview</title>
<para>
You can configure the behavior of Portal's WSRP Producer by using the WSRP administration interface, which
- is the preferred way, or by editing the
- <filename>conf/config.xml</filename>
- file found in
+ is the preferred way, or by editing the <filename>conf/config.xml</filename> file found in
<filename>portal-wsrp.sar</filename>. Several aspects can be modified with respects to whether
registration is required for consumers to access the Producer's services.
</para>
@@ -921,10 +858,9 @@
WSRP standard). It does, however, require consumers to be registered before sending them a full service
description. This means that our WSRP producer will not provide the list of offered portlets and other
capabilities to unregistered consumers. The producer also uses the default
- <classname>RegistrationPolicy</classname>
- paired with the default
+ <classname>RegistrationPolicy</classname> paired with the default
<classname>RegistrationPropertyValidator</classname>. We will look into property
- validators in greater detail later in<xref linkend="registration-configuration"/>. Suffice to say for now
+ validators in greater detail later in <xref linkend="registration-configuration"/>. Suffice to say for now
that this allows users to customize how Portal's WSRP Producer decides whether a given registration property
is valid or not.
</para>
@@ -938,10 +874,8 @@
</imageobject>
</mediaobject>
As would be expected, you can specify whether or not the producer will send the full service description to
- unregistered consumers, and, if it requires registration, which
- <classname>RegistrationPolicy</classname>
- to
- use (and, if needed, which<classname>RegistrationPropertyValidator</classname>), along with required
+ unregistered consumers, and, if it requires registration, which <classname>RegistrationPolicy</classname> to
+ use (and, if needed, which <classname>RegistrationPropertyValidator</classname>), along with required
registration property description for which consumers must provide acceptable values to successfully
register.
</para>
@@ -971,15 +905,11 @@
valign="middle"/>
</imageobject>
</mediaobject>
- You can specify the fully-qualified name for your
- <classname>RegistrationPolicy</classname>
- and
- <classname>RegistrationPropertyValidator</classname>
- there. We will keep the default value. See
- <xref linkend="custom_registration"/>
- for more details. Let's add, however, a registration property called
+ You can specify the fully-qualified name for your <classname>RegistrationPolicy</classname> and
+ <classname>RegistrationPropertyValidator</classname> there. We will keep the default value. See
+ <xref linkend="custom_registration"/> for more details. Let's add, however, a registration property called
<literal>email</literal>. Click "Add property" and enter the appropriate information in the fields,
- providing a description for the registration property that can be used by consumers to figure out its
+ providing a description for the registration property that can be used by consumers to figure out its
purpose:
<mediaobject>
<imageobject>
@@ -987,7 +917,7 @@
</imageobject>
</mediaobject>
Press "Save" to record your modifications.
-
+
<note>
At this time, only String (xsd:string) properties are supported. If your application requires more
complex properties, please let us know.
@@ -998,19 +928,8 @@
registration
information will trigger the invalidation of held registrations, requiring consumers to modify their
registration before being able to access the producer again. We saw the consumer side of that process
- in<xref linkend="reg_mod_error"/>.
- </note>
- previously noted. It can be empty if you don't require registration properties. You can also specify
- whether or not registration is required in order for consumers to access the Producer's full service
- description, as noted in our discussion of the default configuration, above. This is done via the
- <literal>fullServiceDescriptionRequiresRegistration</literal>
- attribute, which is optional. Acceptable
- values for this attribute are
- <literal>true</literal>
- or<literal>false</literal>, defaulting to
- <literal>false</literal>
- in which case the Producer will always
- return the full service description, whether the consumer asking for it is registered or not.
+ in <xref linkend="reg_mod_error"/>.
+ </note>
</para>
<sect3 id="custom_registration">
@@ -1030,18 +949,16 @@
<classname>RegistrationPropertyValidator</classname>
in the default registration policy. This allows users to define their own validation mechanism.
</para>
- <para>Please refer to the Javadoc for
- <classname>org.jboss.portal.registration.RegistrationPolicy</classname>
- and
- <classname>org.jboss.portal.Registration.policies.RegistrationPropertyValidator</classname>
- for more details
- on what is expected of each method.
+ <para>
+ Please refer to the Javadoc for <classname>org.jboss.portal.registration.RegistrationPolicy</classname>
+ and <classname>org.jboss.portal.Registration.policies.RegistrationPropertyValidator</classname> for more
+ details on what is expected of each method.
</para>
<para>Defining a registration policy is required for the producer to be correctly configured. This is
accomplished by specifying the qualified class name of the registration policy. Since we anticipate that
most users will use the default registration policy, it is possible to provide the class
- name of your custom property validator instead to customize the default registration policy behavior. Note
- that property validators are only used by the default policy.
+ name of your custom property validator instead to customize the default registration policy behavior.
+ Note that property validators are only used by the default policy.
<note>Since the policy or the validator are defined via their class name and dynamically loaded, it is
important that you make sure that the identified class is available to the application server. One way
@@ -1050,7 +967,7 @@
provide a default, no-argument constructor.
</note>
</para>
- </sect3>
- </sect2>
+ </sect3>
+ </sect2>
</sect1>
</chapter>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r9308 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-12-06 00:15:49 -0500 (Thu, 06 Dec 2007)
New Revision: 9308
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml
Log:
- Removed some leftover content from previous versions.
- IDEA messed up the layout: fixed some tags being attached to previous word (need to go through the document again).
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml 2007-12-06 01:55:51 UTC (rev 9307)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml 2007-12-06 05:15:49 UTC (rev 9308)
@@ -35,20 +35,15 @@
<para>More information on WSRP can be found on the
<ulink url="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsrp">official website for WSRP</ulink>.
- We suggest reading the
- <ulink
- url="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsrp">primer
- </ulink>
- for a good, albeit technical, overview of WSRP.
+ We suggest reading the <ulink url="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsrp">primer
+ </ulink> for a good, albeit technical, overview of WSRP.
</para>
</sect1>
<sect1 id="wsrp_support">
<title>Level of support in JBoss Portal</title>
<para>The WSRP Technical Committee defined
- <ulink url="http://www.oasis-open.org/committees/download.php/3073">WSRP
- Use Profiles
- </ulink>
+ <ulink url="http://www.oasis-open.org/committees/download.php/3073">WSRP Use Profiles</ulink>
to help with WSRP interoperability. We will refer to terms defined in that document in
this section.
</para>
@@ -72,8 +67,7 @@
<para>While we provide a complete implementation of WSRP 1.0, we do need to go through the
<ulink url="http://www.oasis-open.org/committees/download.php/6018">Conformance statements</ulink>
- and
- perform more interoperability testing (an area that needs to be better supported by the WSRP Technical
+ and perform more interoperability testing (an area that needs to be better supported by the WSRP Technical
Committee and Community at large).
</para>
</sect1>
@@ -81,19 +75,11 @@
<sect1>
<title>Deploying JBoss Portal's WSRP services</title>
<para>
- JBoss Portal provides a complete support of WSRP 1.0 standard interfaces and offers
- both consumer and producer services. WSRP support is provided by the
- <filename>portal-wsrp.sar</filename>
- service archive, included in the main
- <filename>jboss-portal.sar</filename>
- service archive, if you've
- obtained JBoss Portal from a binary distribution. If you don't intend on using WSRP, we recommend that you
- remove
- <filename>portal-wspr.sar</filename>
- from the main
- <filename>jboss-portal.sar</filename>
- service
- archive.
+ JBoss Portal provides a complete support of WSRP 1.0 standard interfaces and offers both consumer and producer
+ services. WSRP support is provided by the <filename>portal-wsrp.sar</filename> service archive, included in
+ the main <filename>jboss-portal.sar</filename> service archive, if you've obtained JBoss Portal from a binary
+ distribution. If you don't intend on using WSRP, we recommend that you remove <filename>portal-wspr.sar</filename>
+ from the main <filename>jboss-portal.sar</filename> service archive.
</para>
<para>If you've obtained the source distribution of JBoss Portal, you need to build and deploy the WSRP service
separately. Please follow the instructions on how to install
@@ -133,7 +119,7 @@
<sect1>
<title>Making a portlet remotable</title>
- <para>JBoss Portal does<emphasis role="bold">NOT</emphasis>, by default, expose local portlets for consumption by
+ <para>JBoss Portal does <emphasis role="bold">NOT</emphasis>, by default, expose local portlets for consumption by
remote WSRP
consumers. In order to make a portlet remotely available, it must be made "remotable" by adding a
<literal>remotable</literal>
@@ -196,19 +182,12 @@
<para>
In the example above, we defined two portlets with a default "remotable" status set to true. This means that
all portlets defined in this descriptor are, by default, exposed remotely by JBoss Portal's WSRP producer.
- Note, however, that it is possible to override the default behavior by adding a
- <literal>remotable</literal>
+ Note, however, that it is possible to override the default behavior by adding a <literal>remotable</literal>
element to a portlet description. In that case, the "remotable" status defined by the portlet takes precedence
- over the default. In the example above, the
- <varname>RemotelyExposedPortlet</varname>
- inherits the "remotable"
- status defined by default since it does not specify a
- <literal>remotable</literal>
- element in its description.
- The<varname>NotRemotelyExposedPortlet</varname>, however, overrides the default behavior and is not remotely
- exposed. Note that in the absence of a top-level
- <literal>remotable</literal>
- element, portlets are NOT
+ over the default. In the example above, the <varname>RemotelyExposedPortlet</varname> inherits the "remotable"
+ status defined by default since it does not specify a <literal>remotable</literal> element in its description.
+ The <varname>NotRemotelyExposedPortlet</varname>, however, overrides the default behavior and is not remotely
+ exposed. Note that in the absence of a top-level <literal>remotable</literal> element, portlets are NOT
remotely exposed.
</para>
</sect1>
@@ -218,7 +197,7 @@
<para>WSRP Consumers vary a lot as far as how they are configured. Most of them require that you either specify
the URL for the Producer's WSDL definition or the URLs for the individual endpoints. Please refer to your
Consumer's documentation for specific instructions. For instructions on how to do so in JBoss Portal, please
- refer to<xref linkend="consumer_configuration"/>.
+ refer to <xref linkend="consumer_configuration"/>.
</para>
<para>
JBoss Portal's Producer is automatically set up when you deploy a portal instance with the WSRP service.
@@ -239,9 +218,7 @@
<filename>http://{hostname}:{port}/portal-wsrp/PortletManagementService</filename>
</listitem>
</itemizedlist>
- The default hostname is
- <literal>localhost</literal>
- and the default port is 8080.
+ The default hostname is <literal>localhost</literal> and the default port is 8080.
</para>
</sect1>
@@ -305,8 +282,7 @@
be up to date and refreshing it from the remote Producer might be a good idea. This can happen for
several reasons: the service description for that remote Producer has not been fetched yet, the cached
version has expired or modifications have been made to the configuration that could potentially
- invalidate
- it, thus requiring re-validation of the information.
+ invalidate it, thus requiring re-validation of the information.
</para>
<para>
@@ -320,7 +296,7 @@
</mediaobject>
You should now see a form allowing you to enter/modify the information about the Consumer.
Set the cache expiration value to 300 seconds and enter the WSDL URL for the producer in the text field
- and press the "Save & Refresh" button:
+ and press the "Refresh & Save" button:
<mediaobject>
<imageobject>
<imagedata fileref="images/wsrp/config_usewsdl.png" format="png" align="center" valign="middle"/>
@@ -329,7 +305,7 @@
This will retrieve the service description associated with the Producer which WSRP is described by the
WSDL file found at the URL you just entered. In our case, querying the service description will allow us
to learn that the Producer requires registration and that it expects a value for the registration
- property named<literal>registration/consumerRole</literal>:
+ property named <literal>registration/consumerRole</literal>:
<mediaobject>
<imageobject>
<imagedata fileref="images/wsrp/config_refresh.png" format="png" align="center" valign="middle"/>
@@ -348,16 +324,13 @@
<imagedata fileref="images/wsrp/config_end.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
- The Consumer for the
- <literal>bea</literal>
- Producer should now be available as a portlet provider and
+ The Consumer for the <literal>bea</literal> Producer should now be available as a portlet provider and
is ready to be used.
</para>
<para>
A producer is configured, by default, by retrieving the producer's information via a WSDL URL. There are
rare cases, however, where URLs need to be provided for each of the producer's end points. You can do
- exactly that by unchecking the "Use WSDL?" checkbox, as is the case for the
- <literal>self</literal>
+ exactly that by unchecking the "Use WSDL?" checkbox, as is the case for the <literal>self</literal>
producer:
<mediaobject>
<imageobject>
@@ -370,9 +343,7 @@
<sect3>
<title>Using a WSRP Producer XML descriptor</title>
- <para>We will create a
- <filename>public-bea-wsrp.xml</filename>
- descriptor. Note that the actual name does not
+ <para>We will create a <filename>public-bea-wsrp.xml</filename> descriptor. Note that the actual name does not
matter as long as it ends with<filename>-wsrp.xml</filename>:
<example>
<programlisting><![CDATA[
@@ -396,9 +367,7 @@
</example>
This producer descriptor gives access to BEA's public WSRP producer. We will look at the details of the
- different elements later. Note for now the
- <literal>producer-id</literal>
- element with a
+ different elements later. Note for now the <literal>producer-id</literal> element with a
"<literal>bea</literal>" value. Put this file in the deploy directory and start the server (with JBoss
Portal and its WSRP service deployed).
</para>
@@ -440,8 +409,7 @@
From there on out, you should be able to configure WSRP portlets just as any other. In particular, you
can create an instance of one of the remote portlets offered by BEA's public producer just like you would
create an instance of a local portlet and then assign it to a window in a page. If you go to that page,
- you
- should see something similar to below for this portlet:
+ you should see something similar to below for this portlet:
<mediaobject>
<imageobject>
<imagedata fileref="images/wsrp/result.png" format="png" align="center" valign="middle"/>
@@ -455,15 +423,13 @@
<title>WSRP Producer descriptors</title>
<para>
- A WSRP Producer descriptor is an XML file which name ends in
- <filename>-wsrp.xml</filename>
- and
+ A WSRP Producer descriptor is an XML file which name ends in <filename>-wsrp.xml</filename> and
which can be dropped in the deploy directory of the JBoss application server or nested in .sar files. It is
possible to configure access to several different producers within a single descriptor or use one file per
producer, depending on your needs. The DTD for the WSRP Producer descriptor format can be found at
<filename>portal-wsrp.sar/dtd/jboss-wsrp-consumer_2_6.dtd</filename>.
- TODO: REPLACE WITH REFERENCE TO SCHEMA INSTEAD.
+ <!--TODO: REPLACE WITH REFERENCE TO SCHEMA INSTEAD.-->
<note>It is important to note how WSRP Producer descriptors are processed. They are read the first time the
WSRP service starts and the associated information is then put in the Portal database. Subsequent launch
@@ -473,11 +439,10 @@
producer in the database will be used. If a producer identifier is found that wasn't already in the
database, that producer information will be processed and recorded in the database. Therefore, if you
wish to delete a producer configuration, you need to delete the associated information in the database
- (this can be accomplished using the configuration portlet as we saw in<xref linkend="consumer_gui"/>)
- <emphasis>AND</emphasis>
- remove the associated information in any
- WSRP Producer descriptor (if such information exists) as the producer will be re-created the next time
- the WSRP is launched if that information is not removed.
+ (this can be accomplished using the configuration portlet as we saw in <xref linkend="consumer_gui"/>)
+ <emphasis>AND</emphasis> remove the associated information in any WSRP Producer descriptor (if such
+ information exists) as the producer will be re-created the next time the WSRP is launched if that
+ information is not removed.
</note>
</para>
@@ -525,10 +490,8 @@
to the remote WSRP services.
<note>It is important to note that, when using this method, JBoss Portal will try to match a port
name to an interface based solely on the provided name. There are no standard names for these
- ports
- so it is possible (though rare) that this matching process fails. In this case, you should look
- at
- the WSDL file and provide the endpoint URLs manually, as per the previous method.
+ ports so it is possible (though rare) that this matching process fails. In this case, you should
+ look at the WSDL file and provide the endpoint URLs manually, as per the previous method.
</note>
</listitem>
</itemizedlist>
@@ -569,13 +532,11 @@
</para>
<para>Additionally, some producers require consumers to register with them before authorizing them to access
- their offered portlets. If you know that information beforehand, you can provide the required
- registration
+ their offered portlets. If you know that information beforehand, you can provide the required registration
information in the producer configuration so that the Portal consumer can register with the remote
producer when required.
<note>At this time, though, only simple String properties are supported and it is not possible to
- configure
- complex registration data. This should however be sufficient for most cases.
+ configure complex registration data. This should however be sufficient for most cases.
</note>
</para>
@@ -603,11 +564,8 @@
<title>Examples</title>
<para>
- Here is the configuration of the
- <literal>self</literal>
- producer as found in
- <filename>default-wsrp.xml</filename>
- with a cache expiring every five minutes:
+ Here is the configuration of the <literal>self</literal> producer as found in
+ <filename>default-wsrp.xml</filename> with a cache expiring every five minutes:
</para>
<example>
@@ -644,8 +602,7 @@
</example>
<para>Here is an example of a WSRP descriptor with a 2 minute caching time and manual definition of the
- endpoint
- URLs:
+ endpoint URLs:
</para>
<example>
@@ -726,13 +683,9 @@
If you recall, the producer was requiring registration and required a value to be provided for the
<literal>registration/consumerRole</literal>
property. The description of that property indicated that
- three values were possible:<literal>public</literal>,
- <literal>partner</literal>
- or
- <literal>insider</literal>
- each corresponding to a different service level. We registered using the
- <literal>public</literal>
- service level. This gave us access to three portlets as shown here:
+ three values were possible: <literal>public</literal>, <literal>partner</literal> or
+ <literal>insider</literal> each corresponding to a different service level. We registered using the
+ <literal>public</literal> service level. This gave us access to three portlets as shown here:
<mediaobject>
<imageobject>
<imagedata fileref="images/wsrp/bea.png" format="png" align="center" valign="middle"/>
@@ -743,13 +696,8 @@
Suppose now that we would like to upgrade our service level to the "insider" level. We will need to
tell BEA's producer that our registration data has been modified. Let's see how to do this. Assuming you
have configured access to the producer as previously described, please go to the configuration screen for
- the
- <literal>bea</literal>
- producer and modify the value of the
- <literal>registration/consumerRole</literal>
- to
- <literal>insider</literal>
- instead of<literal>public</literal>:
+ the <literal>bea</literal> producer and modify the value of the <literal>registration/consumerRole</literal>
+ to <literal>insider</literal> instead of <literal>public</literal>:
<mediaobject>
<imageobject>
<imagedata fileref="images/wsrp/modify_reg_start.png" format="png" align="center" valign="middle"/>
@@ -770,9 +718,7 @@
<imagedata fileref="images/wsrp/modify_reg_end.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
- You can now check the list of available portlets from the
- <literal>bea</literal>
- provider and verify that
+ You can now check the list of available portlets from the <literal>bea</literal> provider and verify that
new portlets are now available:
<mediaobject>
<imageobject>
@@ -790,9 +736,7 @@
It can also happen that a producer administrator decided to require more information from registered
consumers. In this case, invoking operations on the producer will fail with an
<exceptionname>OperationFailedFault</exceptionname>. JBoss Portal will attempt to help you in this
- situation. Let's walk through an example using the
- <literal>self</literal>
- producer. Let's assume that
+ situation. Let's walk through an example using the <literal>self</literal> producer. Let's assume that
registration is required without any registration properties (as is the case by default). If you go to
the configuration screen for this producer, you should see:
<mediaobject>
@@ -802,9 +746,8 @@
</mediaobject>
Now suppose that the administrator of the producer now requires a value to be provided for an
- <literal>email</literal>
- registration property. We will actually see how to do perform this operation
- in JBoss Portal when we examine how to configure Portal's producer in<xref linkend="producer_config"/>.
+ <literal>email</literal> registration property. We will actually see how to do perform this operation
+ in JBoss Portal when we examine how to configure Portal's producer in <xref linkend="producer_config"/>.
Operations with this producer will now fail. If you suspect that a registration modification is required,
you should go to the configuration screen for this remote producer and refresh the information held by
the consumer by pressing "Refresh & Save":
@@ -815,9 +758,7 @@
</mediaobject>
As you can see, the configuration screen now shows the currently held registration information and
- the expected information from the producer. Enter a value for the
- <literal>email</literal>
- property
+ the expected information from the producer. Enter a value for the <literal>email</literal> property
and then click on "Modify registration". If all went well and the producer accepted your new registration
data, you should see something similar to:
<mediaobject>
@@ -828,11 +769,9 @@
</mediaobject>
<note>As of WSRP 1, it is rather difficult to ascertain for sure what caused an
- <exceptionname>OperationFailedFault</exceptionname>
- as it is the generic exception returned by
+ <exceptionname>OperationFailedFault</exceptionname> as it is the generic exception returned by
producers if something didn't quite happen as expected during a method invocation. This means that
- <exceptionname>OperationFailedFault</exceptionname>
- can be caused by several different reasons, one
+ <exceptionname>OperationFailedFault</exceptionname> can be caused by several different reasons, one
of them being a request to modify the registration data. Please take a look at the log files to see
if you can gather more information as to what happened. WSRP 2 introduces an exception that is
specific to a request to modify registrations thus reducing the ambiguity that currently exists.
@@ -906,9 +845,7 @@
<title>Overview</title>
<para>
You can configure the behavior of Portal's WSRP Producer by using the WSRP administration interface, which
- is the preferred way, or by editing the
- <filename>conf/config.xml</filename>
- file found in
+ is the preferred way, or by editing the <filename>conf/config.xml</filename> file found in
<filename>portal-wsrp.sar</filename>. Several aspects can be modified with respects to whether
registration is required for consumers to access the Producer's services.
</para>
@@ -921,10 +858,9 @@
WSRP standard). It does, however, require consumers to be registered before sending them a full service
description. This means that our WSRP producer will not provide the list of offered portlets and other
capabilities to unregistered consumers. The producer also uses the default
- <classname>RegistrationPolicy</classname>
- paired with the default
+ <classname>RegistrationPolicy</classname> paired with the default
<classname>RegistrationPropertyValidator</classname>. We will look into property
- validators in greater detail later in<xref linkend="registration-configuration"/>. Suffice to say for now
+ validators in greater detail later in <xref linkend="registration-configuration"/>. Suffice to say for now
that this allows users to customize how Portal's WSRP Producer decides whether a given registration property
is valid or not.
</para>
@@ -938,10 +874,8 @@
</imageobject>
</mediaobject>
As would be expected, you can specify whether or not the producer will send the full service description to
- unregistered consumers, and, if it requires registration, which
- <classname>RegistrationPolicy</classname>
- to
- use (and, if needed, which<classname>RegistrationPropertyValidator</classname>), along with required
+ unregistered consumers, and, if it requires registration, which <classname>RegistrationPolicy</classname> to
+ use (and, if needed, which <classname>RegistrationPropertyValidator</classname>), along with required
registration property description for which consumers must provide acceptable values to successfully
register.
</para>
@@ -971,15 +905,11 @@
valign="middle"/>
</imageobject>
</mediaobject>
- You can specify the fully-qualified name for your
- <classname>RegistrationPolicy</classname>
- and
- <classname>RegistrationPropertyValidator</classname>
- there. We will keep the default value. See
- <xref linkend="custom_registration"/>
- for more details. Let's add, however, a registration property called
+ You can specify the fully-qualified name for your <classname>RegistrationPolicy</classname> and
+ <classname>RegistrationPropertyValidator</classname> there. We will keep the default value. See
+ <xref linkend="custom_registration"/> for more details. Let's add, however, a registration property called
<literal>email</literal>. Click "Add property" and enter the appropriate information in the fields,
- providing a description for the registration property that can be used by consumers to figure out its
+ providing a description for the registration property that can be used by consumers to figure out its
purpose:
<mediaobject>
<imageobject>
@@ -987,7 +917,7 @@
</imageobject>
</mediaobject>
Press "Save" to record your modifications.
-
+
<note>
At this time, only String (xsd:string) properties are supported. If your application requires more
complex properties, please let us know.
@@ -998,19 +928,8 @@
registration
information will trigger the invalidation of held registrations, requiring consumers to modify their
registration before being able to access the producer again. We saw the consumer side of that process
- in<xref linkend="reg_mod_error"/>.
- </note>
- previously noted. It can be empty if you don't require registration properties. You can also specify
- whether or not registration is required in order for consumers to access the Producer's full service
- description, as noted in our discussion of the default configuration, above. This is done via the
- <literal>fullServiceDescriptionRequiresRegistration</literal>
- attribute, which is optional. Acceptable
- values for this attribute are
- <literal>true</literal>
- or<literal>false</literal>, defaulting to
- <literal>false</literal>
- in which case the Producer will always
- return the full service description, whether the consumer asking for it is registered or not.
+ in <xref linkend="reg_mod_error"/>.
+ </note>
</para>
<sect3 id="custom_registration">
@@ -1030,18 +949,16 @@
<classname>RegistrationPropertyValidator</classname>
in the default registration policy. This allows users to define their own validation mechanism.
</para>
- <para>Please refer to the Javadoc for
- <classname>org.jboss.portal.registration.RegistrationPolicy</classname>
- and
- <classname>org.jboss.portal.Registration.policies.RegistrationPropertyValidator</classname>
- for more details
- on what is expected of each method.
+ <para>
+ Please refer to the Javadoc for <classname>org.jboss.portal.registration.RegistrationPolicy</classname>
+ and <classname>org.jboss.portal.Registration.policies.RegistrationPropertyValidator</classname> for more
+ details on what is expected of each method.
</para>
<para>Defining a registration policy is required for the producer to be correctly configured. This is
accomplished by specifying the qualified class name of the registration policy. Since we anticipate that
most users will use the default registration policy, it is possible to provide the class
- name of your custom property validator instead to customize the default registration policy behavior. Note
- that property validators are only used by the default policy.
+ name of your custom property validator instead to customize the default registration policy behavior.
+ Note that property validators are only used by the default policy.
<note>Since the policy or the validator are defined via their class name and dynamically loaded, it is
important that you make sure that the identified class is available to the application server. One way
@@ -1050,7 +967,7 @@
provide a default, no-argument constructor.
</note>
</para>
- </sect3>
- </sect2>
+ </sect3>
+ </sect2>
</sect1>
</chapter>
18 years, 7 months
- 1
- 0