[jboss-svn-commits] JBL Code SVN: r6158 - in labs/jbossforums/trunk/forums/src: main/org/jboss/portlet/forums/ui resources/portal-forums-sar/META-INF

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

Author: unibrew
Date: 2006-09-11 18:07:28 -0400 (Mon, 11 Sep 2006)
New Revision: 6158

Modified:
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
   labs/jbossforums/trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml
Log:
[JBFORUMS-105] Migration issues - working on ;-)

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2006-09-11 22:04:18 UTC (rev 6157)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2006-09-11 22:07:28 UTC (rev 6158)
@@ -57,8 +57,8 @@
 
 import org.jboss.portal.core.CoreConstants;
 import org.jboss.portal.core.modules.ModuleConstants;
-import org.jboss.portal.core.modules.UserModule;
-import org.jboss.portal.core.model.User;
+import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.identity.User;
 import org.jboss.portal.format.render.bbcodehtml.ToHTMLConfig;
 import org.jboss.portal.format.render.bbcodehtml.ToHTMLRenderer;
 import org.jboss.portal.format.util.CLLoader;

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml	2006-09-11 22:04:18 UTC (rev 6157)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml	2006-09-11 22:07:28 UTC (rev 6158)
@@ -1,53 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean
-      code="org.jboss.portal.core.hibernate.SessionFactoryBinder"
-      name="portal.forums:service=Hibernate"
-      xmbean-dd="org/jboss/portal/core/hibernate/SessionFactoryBinder.xml">
-      <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
-      <attribute name="DoChecking">true</attribute>
-      <attribute name="ConfigLocation">conf/hibernate/hibernate.cfg.xml</attribute>
-      <attribute name="SetupLocation">conf/hibernate/setup.txt</attribute>
-   </mbean>
-   <mbean
-      code="org.jboss.portlet.forums.impl.ForumsModuleImpl"
-      name="portal.forums:service=Module,type=Forums"
-      xmbean-dd="org/jboss/portlet/forums/impl/ForumsModuleImpl.xml">
-      <!-- Flood interval in seconds -->
-      <attribute name="FloodInterval">30</attribute>
-      <!-- Email address used for FROM field of email notification -->
-      <attribute name="FromAddress">portal at example.com</attribute>
-      <attribute name="JNDIName">java:portal/ForumsModule</attribute>
-      <depends optional-attribute-name="Hibernate" proxy-type="attribute">portal.forums:service=Hibernate</depends>
-   </mbean>
-   <!-- configure the AuthorizationContext for this application -->
-	<mbean name="portal.forums:service=AuthorizationContext"
-	code="org.jboss.portlet.forums.auth.AuthorizationContextImpl" 	
-	xmbean-dd=""
-	>
-	    <!-- plug-in an AuthorizationProvider that implements the AuthorizationInterface here -->
-	    <attribute name="providerImpl">org.jboss.forums.security.AuthorizationProvider</attribute>
-		<xmbean>
-			<class>org.jboss.portlet.forums.auth.AuthorizationContextImpl</class>
-			<constructor>      				
-      				<name>org.jboss.portlet.forums.auth.AuthorizationContextImpl</name>
-   			</constructor>
-			<attribute access="write" setMethod="setProviderImpl">
-				     <name>providerImpl</name>
-					 <type>java.lang.String</type>					 
-		    </attribute>
-		    <attribute access="read" getMethod="getProvider">
-		    	<name>provider</name>
-				<type>org.jboss.portlet.forums.auth.AuthorizationInterface</type>					 
-		    </attribute>			
-		    <operation>
-		    	<description>The start lifecycle operation</description>
-		    	<name>start</name>
-		    </operation>
-		    <operation>
-		    	<description>The stop lifecycle operation</description>
-		    	<name>stop</name>
-		    </operation>		    
-		</xmbean>
-	</mbean>   
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean
+      code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+      name="portal.forums:service=Hibernate"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
+      <attribute name="DoChecking">true</attribute>
+      <attribute name="ConfigLocation">conf/hibernate/hibernate.cfg.xml</attribute>
+      <attribute name="SetupLocation">conf/hibernate/setup.txt</attribute>
+   </mbean>
+   <mbean
+      code="org.jboss.portlet.forums.impl.ForumsModuleImpl"
+      name="portal.forums:service=Module,type=Forums"
+      xmbean-dd=""
+      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+      <xmbean/>
+      <!-- Flood interval in seconds -->
+      <attribute name="FloodInterval">30</attribute>
+      <!-- Email address used for FROM field of email notification -->
+      <attribute name="FromAddress">portal at example.com</attribute>
+      <attribute name="JNDIName">java:portal/ForumsModule</attribute>
+      <depends optional-attribute-name="Hibernate" proxy-type="attribute">portal.forums:service=Hibernate</depends>
+   </mbean>
+<!-- configure the AuthorizationContext for this application -->
+<mbean name="portal.forums:service=AuthorizationContext"
+       code="org.jboss.portlet.forums.auth.AuthorizationContextImpl" 	
+       xmbean-dd=""
+       >
+	<!-- plug-in an AuthorizationProvider that implements the AuthorizationInterface here -->
+	<attribute name="providerImpl">org.jboss.forums.security.AuthorizationProvider</attribute>
+	<xmbean>
+		<class>org.jboss.portlet.forums.auth.AuthorizationContextImpl</class>
+		<constructor>      				
+			<name>org.jboss.portlet.forums.auth.AuthorizationContextImpl</name>
+		</constructor>
+		<attribute access="write" setMethod="setProviderImpl">
+			<name>providerImpl</name>
+			<type>java.lang.String</type>					 
+		</attribute>
+		<attribute access="read" getMethod="getProvider">
+			<name>provider</name>
+			<type>org.jboss.portlet.forums.auth.AuthorizationInterface</type>					 
+		</attribute>
+		<operation impact="INFO">
+			<description>Method for getting Provider</description>
+			<name>getProvider</name>
+			<return-type>org.jboss.portlet.forums.auth.AuthorizationInterface</return-type>
+		</operation>
+		<!--operation impact="ACTION">
+			<description>Method for setting Provider</description>
+			<name>setProviderImpl</name>
+			<parameter>java.lang.String</parameter>
+			<return-type></return-type>
+		</operation-->
+		<operation>
+			<description>The start lifecycle operation</description>
+			<name>start</name>
+		</operation>
+		<operation>
+			<description>The stop lifecycle operation</description>
+			<name>stop</name>
+		</operation>		    
+	</xmbean>
+</mbean>   
 </server>
\ No newline at end of file