[jboss-svn-commits] JBL Code SVN: r12855 - in labs/jbosslabs/trunk/portal-extensions: configuration and 4 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2007-06-26 04:29:29 -0400 (Tue, 26 Jun 2007)
New Revision: 12855

Modified:
   labs/jbosslabs/trunk/portal-extensions/
   labs/jbosslabs/trunk/portal-extensions/configuration/
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/conf/
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jbossweb-tomcat55.sar/
   labs/jbosslabs/trunk/portal-extensions/forge-ejb3/
Log:
Fixing URL factories


Property changes on: labs/jbosslabs/trunk/portal-extensions
___________________________________________________________________
Name: svn:ignore
   - .svnignore
.project-svnignore
build.properties
target
*.iml
*.ipr
*.iws

   + .classpath
.project
.svnignore
.project-svnignore
build.properties
target
*.iml
*.ipr
*.iws



Property changes on: labs/jbosslabs/trunk/portal-extensions/configuration
___________________________________________________________________
Name: svn:ignore
   + .classpath
.project
bin



Property changes on: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/conf
___________________________________________________________________
Name: svn:ignore
   - log4j.xml

   + log4j.xml
server.keystore


Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml	2007-06-26 07:26:49 UTC (rev 12854)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml	2007-06-26 08:29:29 UTC (rev 12855)
@@ -838,57 +838,6 @@
          proxy-type="attribute">portal:commandFactory=Ajax</depends>
    </mbean>
 
-   <!-- URL factories -->
-   <!-- LABS <mbean
-      code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
-      name="portal:urlFactory=Delegating"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean> -->
-   <mbean
-      code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
-      name="portal:urlFactory=PortalObject,type=Default"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Namespace"><![CDATA[]]></attribute>
-      <attribute name="Path">/portal</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="Mapper"
-         proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default</depends>
-   </mbean>
-   <mbean
-      code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
-      name="portal:urlFactory=SignOut"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Path">/signout</attribute>
-      <attribute name="ClassNames">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-   </mbean>
-   <!-- LABS <mbean
-      code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
-      name="portal:urlFactory=PortalObject,type=Dashboard"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
-      <xmbean/>
-      <attribute name="Namespace">dashboard</attribute>
-      <attribute name="Path">/dashboard</attribute>
-      <depends
-         optional-attribute-name="Factory"
-         proxy-type="attribute">portal:urlFactory=Delegating</depends>
-      <depends
-         optional-attribute-name="Mapper"
-         proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard</depends>
-   </mbean> -->
-
    <!-- The federating portlet invoker -->
    <mbean
       code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService"
@@ -1367,6 +1316,50 @@
     </mbean>
 
     <!-- URL factories -->
+   <!-- LABS
+   <mbean
+      code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+      name="portal:urlFactory=PortalObject,type=Default"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Namespace"><![CDATA[]]></attribute>
+      <attribute name="Path">/portal</attribute>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+      <depends
+         optional-attribute-name="Mapper"
+         proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default</depends>
+   </mbean>-->
+   <mbean
+      code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+      name="portal:urlFactory=SignOut"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Path">/signout</attribute>
+      <attribute name="ClassNames">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+   </mbean>
+   <!-- LABS <mbean
+      code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+      name="portal:urlFactory=PortalObject,type=Dashboard"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+      <xmbean/>
+      <attribute name="Namespace">dashboard</attribute>
+      <attribute name="Path">/dashboard</attribute>
+      <depends
+         optional-attribute-name="Factory"
+         proxy-type="attribute">portal:urlFactory=Delegating</depends>
+      <depends
+         optional-attribute-name="Mapper"
+         proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard</depends>
+   </mbean> -->
+    
     <!-- LABS -->
     <mbean
        code="org.jboss.labs.mapper.url.LabsDelegatingURLFactoryService"


Property changes on: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jbossweb-tomcat55.sar
___________________________________________________________________
Name: svn:ignore
   + server.xml



Property changes on: labs/jbosslabs/trunk/portal-extensions/forge-ejb3
___________________________________________________________________
Name: svn:ignore
   - target

   + .classpath
.project
target