[jboss-svn-commits] JBL Code SVN: r9216 - in labs/jbosslabs/trunk/portal-extensions-newprj: forge-common/src and 17 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 31 14:04:43 EST 2007
Author: adamw
Date: 2007-01-31 14:04:43 -0500 (Wed, 31 Jan 2007)
New Revision: 9216
Added:
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/ejb/
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/ejb/META-INF/
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/ejb/META-INF/persistence.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java
Removed:
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/ejb/
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceImpl.java
Modified:
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/maven.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/project.properties
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/LabsServices.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/PrimatesService.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectPagesService.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/primates/PrimateDTO.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/maven.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/project.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/propertypersistance/PropertyServiceBean.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-sar/src/forge-service.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java
labs/jbosslabs/trunk/portal-extensions-newprj/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java
labs/jbosslabs/trunk/portal-extensions-newprj/primates/project.xml
labs/jbosslabs/trunk/portal-extensions-newprj/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java
Log:
Labs EJB3 components
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/maven.xml 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/maven.xml 2007-01-31 19:04:43 UTC (rev 9216)
@@ -5,7 +5,7 @@
-->
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
<goal name="all">
- <attainGoal name="prj-all" />
+ <attainGoal name="prj-all" />
</goal>
<goal name="clean">
@@ -13,8 +13,6 @@
</goal>
<goal name="build">
- <attainGoal name="ejb" />
- <ant:copy file="target/${maven.final.name}.jar" toFile="target/${maven.final.name}.ejb3" />
<attainGoal name="jar" />
</goal>
@@ -24,10 +22,5 @@
<ant:filename name="target/*.jar" />
</ant:fileset>
</ant:copy>
- <ant:copy todir="${local.deploy.dir}" flatten="true">
- <ant:fileset dir=".">
- <ant:filename name="target/*.ejb3" />
- </ant:fileset>
- </ant:copy>
</goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/project.properties 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/project.properties 2007-01-31 19:04:43 UTC (rev 9216)
@@ -1,5 +1,3 @@
maven.repo.remote=http://repo1.maven.org/maven
maven.junit.fork=yes
-maven.war.src=${basedir}/src/web
-maven.ejb.includes=**/ejb3/*.class,**/propertypersistance/PropertyService.class,**/soa/projects/ProjectsServiceImpl.class
-maven.jar.excludes=**/ejb3/*.class,**/soa/projects/ProjectsServiceImpl.class
\ No newline at end of file
+maven.war.src=${basedir}/src/web
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/LabsServices.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/LabsServices.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/LabsServices.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -52,4 +52,9 @@
return (ProjectsService) MBeanProxyExt.create(ProjectsService.class,
ProjectsService.PROJECTS_SERVICE, MBeanServerLocator.locate());
}
+
+ public static ProjectPagesService getProjectPagesService() throws NamingException {
+ return (ProjectPagesService)(new InitialContext()).lookup(
+ ProjectPagesService.PROJECT_PAGES_SERVICE);
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/PrimatesService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/PrimatesService.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/PrimatesService.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -22,6 +22,7 @@
package org.jboss.forge.common.ejb3;
+import org.jboss.forge.common.primates.PrimateDTO;
import org.jboss.portal.identity.User;
/**
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectPagesService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectPagesService.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectPagesService.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -1,8 +1,23 @@
package org.jboss.forge.common.ejb3;
+import java.util.Set;
+
/**
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
public interface ProjectPagesService {
- public static final String PROJECT_PAGES_SERVICE = "labs:service=projectpages";
+ public static final String PROJECT_PAGES_SERVICE = "ProjectPagesServiceBean/local";
+
+ /**
+ * Updates pages and portlets for the given project.
+ * @param projectId Project for which to update the pages.
+ */
+ public void updatePages(String projectId);
+
+ /**
+ * Removes pages belonging to projects, which are not in the given set.
+ * @param projectIds Set of project ids, for which pages shouldn't be
+ * deleted.
+ */
+ public void removeExcessPages(Set<String> projectIds);
}
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -81,13 +81,6 @@
public boolean getPackagedForDownload(String projectId);
/**
- * Gets a unique stamp of the current version of projects; this should change
- * on a change in descriptor files.
- * @return A stamp of the current version of projects configuration.
- */
- public long getStamp();
-
- /**
* This method will overwrite existing project definition in xml file
* with a new one generated from data contained in given Project object.
* Be aware, data is NOT merged but overwritten!
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/primates/PrimateDTO.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/primates/PrimateDTO.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/primates/PrimateDTO.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.forge.common.ejb3.primates;
+package org.jboss.forge.common.primates;
import java.util.HashSet;
import java.util.Iterator;
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -27,11 +27,14 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
+import javax.naming.NamingException;
import org.apache.xerces.parsers.DOMParser;
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.SearchTools;
import org.jboss.forge.common.XmlTools;
+import org.jboss.forge.common.ejb3.LabsServices;
+import org.jboss.forge.common.ejb3.ProjectPagesService;
import org.jboss.forge.common.projects.XmlInputFactory.XmlNotFoundException;
import org.jboss.forge.common.projects.elements.BindingsHandlerIterSingleKey;
import org.jboss.forge.common.projects.elements.ElementDescriptor;
@@ -116,8 +119,6 @@
private String portalName;
- private long stamp;
-
/**
* Parses project xml descriptors and stores information about the projects.
*
@@ -127,8 +128,6 @@
* Name of the portal to which projects belongs to.
*/
public ProjectsDescriptor(XmlInputFactory isf, String portalName) {
- stamp = System.currentTimeMillis();
-
this.portalName = portalName;
projects = new LinkedHashMap<String, ProjectDescriptor>();
newProjects = new LinkedHashMap<String, Project>();
@@ -155,8 +154,19 @@
fillContext(new NullPermissionsChecker());
fillLevels();
} catch (Exception e) {
- log.error("Projects descriptor constructor: " + e);
+ log.error("Projects descriptor constructor.", e);
}
+
+ try {
+ ProjectPagesService pps = LabsServices.getProjectPagesService();
+ for (String projectId : getProjectIds()) {
+ pps.updatePages(projectId);
+ }
+
+ pps.removeExcessPages(getProjectIds());
+ } catch (NamingException e) {
+ log.error("Error getting labs project pages service.", e);
+ }
}
private final static String PROJECT_EL = "project";
@@ -174,9 +184,7 @@
{ ProjectsHelper.CATEGORIES_DESC, "category", "categories",
getOPDefaultPropertiesHandler() },
{ ProjectsHelper.JEMS_DESC, "jems", "jems",
- getOPDefaultPropertiesHandler() },
- /*{ ProjectsHelper.PAGES_DESC, "page", "pages",
- getPagesPropertiesHandler() }*/ };
+ getOPDefaultPropertiesHandler() }};
private static PropertiesHandler getOPDefaultPropertiesHandler() {
PropertiesHandlerStack phs = new PropertiesHandlerStack();
@@ -219,15 +227,6 @@
return phs;
}
- /**
- * Gets a stamp of this projects descriptor. Should be different between two
- * versions of projects descriptor.
- * @return A unique (for this version) stamp of projects descriptor.
- */
- public long getStamp() {
- return stamp;
- }
-
private void addOutsideProperty(XmlInputFactory isf,
DomToXmlTransformer xht, OutsidePropertiesMap opm, Object[] data)
throws SAXException, IOException, XmlNotFoundException {
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/maven.xml 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/maven.xml 2007-01-31 19:04:43 UTC (rev 9216)
@@ -4,22 +4,22 @@
See terms of license at gnu.org.
-->
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
- <!-- Default war-project goals -->
+ <!-- Default war-project goals -->
- <goal name="all">
- <attainGoal name="prj-all" />
- </goal>
+ <goal name="all">
+ <attainGoal name="prj-all" />
+ </goal>
- <goal name="build">
- <attainGoal name="jar" />
- </goal>
-
- <goal name="deploy">
+ <goal name="build">
+ <attainGoal name="ejb" />
+ </goal>
+
+ <goal name="deploy">
<ant:copy file="target/${maven.final.name}.jar"
tofile="${local.deploy.dir}/${maven.final.name}.ejb3" />
</goal>
-
- <goal name="clean">
- <attainGoal name="prj-clean" />
- </goal>
+
+ <goal name="clean">
+ <attainGoal name="prj-clean" />
+ </goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/project.xml 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/project.xml 2007-01-31 19:04:43 UTC (rev 9216)
@@ -42,5 +42,35 @@
<artifactId>jboss-annotations-ejb3</artifactId>
<jar>jboss-annotations-ejb3.jar</jar>
</dependency>
+ <dependency>
+ <groupId>jaxb</groupId>
+ <artifactId>JAXB2</artifactId>
+ <version>2.0</version>
+ <jar>jaxb-api.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jaxb</groupId>
+ <artifactId>JAXB2173API</artifactId>
+ <version>1.0</version>
+ <jar>jsr173_1.0_api.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jaxb</groupId>
+ <artifactId>Activation</artifactId>
+ <version>1.0</version>
+ <jar>activation.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jaxb</groupId>
+ <artifactId>JAXBIMPL</artifactId>
+ <version>2.0</version>
+ <jar>jaxb-impl.jar</jar>
+ </dependency>
+ <dependency>
+ <groupId>jaxb</groupId>
+ <artifactId>XJC</artifactId>
+ <version>2.0</version>
+ <jar>jaxb-xjc.jar</jar>
+ </dependency>
</dependencies>
</project>
Added: labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/ejb/META-INF/persistence.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/ejb/META-INF/persistence.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/ejb/META-INF/persistence.xml 2007-01-31 19:04:43 UTC (rev 9216)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+ <persistence-unit name="property_persistance">
+ <jta-data-source>java:/LabsDS</jta-data-source>
+ <properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" />
+ <property name="hibernate.hbm2ddl.auto" value="update" />
+ </properties>
+ </persistence-unit>
+</persistence>
Copied: labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java (from rev 9208, labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceImpl.java)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -0,0 +1,20 @@
+package org.jboss.forge.ejb3.projectpages;
+
+import org.jboss.forge.common.ejb3.ProjectPagesService;
+
+import javax.ejb.Stateless;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+ at Stateless
+public class ProjectPagesServiceBean implements ProjectPagesService {
+ public void updatePages(String projectId) {
+ System.out.println("UPDATING PROJECT PAGES: " + projectId);
+ }
+
+ public void removeExcessPages(Set<String> projectIds) {
+ System.out.println("REMOVING EXCESS PAGES");
+ }
+}
Deleted: labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceImpl.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceImpl.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -1,11 +0,0 @@
-package org.jboss.forge.ejb3.projectpages;
-
-/**
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- */
-//@Service(objectName= ProjectPagesService.PROJECT_PAGES_SERVICE)
-//@Management(ProjectPagesService.class)
-//@Depends(ProjectsService.PROJECTS_SERVICE)
-public class ProjectPagesServiceImpl {
-
-}
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -51,7 +51,7 @@
import org.jboss.forge.common.projects.project.RepoMonitor;
import org.jboss.forge.common.projects.project.Repository;
import org.jboss.forge.common.projects.project.SupportService;
-import org.jboss.forge.ejb3.ProjectsService;
+import org.jboss.forge.common.ejb3.ProjectsService;
import org.jboss.logging.Logger;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Node;
@@ -185,10 +185,6 @@
return project != null && project.isPackagedForDownload();
}
- public long getStamp() {
- return ProjectsHelper.getProjects(PORTAL_NAME).getProjectsDescriptor().getStamp();
- }
-
/**
* This method will overwrite existing project definition in xml file
* with a new one generated from data contained in given Project object.
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/propertypersistance/PropertyServiceBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/propertypersistance/PropertyServiceBean.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-ejb3/src/java/org/jboss/forge/ejb3/propertypersistance/PropertyServiceBean.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -4,7 +4,7 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.jboss.forge.ejb3.PropertyService;
+import org.jboss.forge.common.ejb3.PropertyService;
@Stateless
public class PropertyServiceBean implements PropertyService {
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -72,7 +72,7 @@
* checked in the url mapper).
*/
String projectId = getProjectId(request);
- System.out.println("PROJECT ID: " + projectId);
+ //System.out.println("PROJECT ID: " + projectId);
String portalName = ForgeHelper.getPortalName(request);
@@ -101,7 +101,7 @@
Object requestedPathFromPref = request.getPreferences().getValue(
"page", null);
- System.out.println("REQ PATH FROM PREF: " + requestedPathFromPref);
+ //System.out.println("REQ PATH FROM PREF: " + requestedPathFromPref);
if (!Tools.isEmpty((String) requestedPathFromPref)) {
requestedPath = (String) requestedPathFromPref;
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-sar/src/forge-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-sar/src/forge-service.xml 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-sar/src/forge-service.xml 2007-01-31 19:04:43 UTC (rev 9216)
@@ -10,7 +10,7 @@
<!-- Invoke invoke(Invocation mi) operation or the target method -->
<attribute name="InvokeTargetMethod">true</attribute>
<!-- MyService interface -->
- <attribute name="ExportedInterfaces">org.jboss.forge.common.soa.projects.ProjectsService</attribute>
+ <attribute name="ExportedInterfaces">org.jboss.forge.common.ejb3.ProjectsService</attribute>
<attribute name="ClientInterceptors">
<interceptors>
<interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -28,8 +28,8 @@
import javax.naming.NamingException;
import org.jboss.forge.common.PermissionTools;
-import org.jboss.forge.common.soa.LabsServices;
-import org.jboss.forge.common.soa.primates.PrimatesService;
+import org.jboss.forge.common.ejb3.LabsServices;
+import org.jboss.forge.common.ejb3.PrimatesService;
import org.jboss.labs.tagme.gwt.client.AddTagsClickListener;
import org.jboss.labs.tagme.gwt.client.TaggingService;
import org.jboss.labs.tagme.services.TagMeTagger;
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTools.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -1,7 +1,7 @@
package org.jboss.labs.tagme.services;
import org.jboss.forge.common.PermissionTools;
-import org.jboss.forge.common.soa.LabsServices;
+import org.jboss.forge.common.ejb3.LabsServices;
import org.jboss.portal.identity.User;
public class TagMeTools {
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/jmm/jmm-common/src/java/org/jboss/forge/jmm/common/tools/ProjectTools.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -15,7 +15,7 @@
import org.jboss.forge.common.projects.project.Project;
import org.jboss.forge.common.projects.project.RepoType;
import org.jboss.forge.common.projects.project.Repository;
-import org.jboss.forge.common.soa.projects.ProjectsService;
+import org.jboss.forge.common.ejb3.ProjectsService;
import org.jboss.logging.Logger;
/**
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/primates/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/primates/project.xml 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/primates/project.xml 2007-01-31 19:04:43 UTC (rev 9216)
@@ -29,6 +29,11 @@
<jar>ejb3-persistence.jar</jar>
</dependency>
<dependency>
+ <groupId>jboss-forge</groupId>
+ <artifactId>forge-common</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-ejb3x</artifactId>
<version>3.0RC6</version>
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java 2007-01-31 19:01:50 UTC (rev 9215)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/primates/src/java/org/jbosslabs/portlets/primates/service/PrimatesServiceImpl.java 2007-01-31 19:04:43 UTC (rev 9216)
@@ -30,8 +30,8 @@
import org.jboss.annotation.ejb.Management;
import org.jboss.annotation.ejb.Service;
-import org.jboss.forge.common.soa.primates.PrimateDTO;
import org.jboss.forge.common.ejb3.PrimatesService;
+import org.jboss.forge.common.primates.PrimateDTO;
import org.jboss.logging.Logger;
import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
import org.jboss.portal.identity.User;
More information about the jboss-svn-commits
mailing list