[jboss-svn-commits] JBL Code SVN: r9987 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/java/org/jboss/forge/common/projects/proxies and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 5 15:42:43 EST 2007
Author: wrzep
Date: 2007-03-05 15:42:43 -0500 (Mon, 05 Mar 2007)
New Revision: 9987
Added:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/ProjectRWProxy.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/SyncProxy.java
labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java
Log:
JBLAB-840
hack to make it work with JAXB marshaller
-Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-03-05 20:37:36 UTC (rev 9986)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-03-05 20:42:43 UTC (rev 9987)
@@ -374,11 +374,10 @@
isf.getInputSource(projectId+"/" + ProjectsHelper.PROJECT_DESC));
newProjectsRW.put(projectId,
- //(Project) SyncProxy.newInstance(newProjectRW));
- //TODO fix proxy/interfaces JAXB issue :/
- newProjectRW);
+ (Project) SyncProxy.newInstance(newProjectRW));
log.info("Project "+projectId+" created.");
+
} catch (Exception e) {
log.warn("I could not create Project "+projectId+" (RW mode).",e);
}
Added: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/ProjectRWProxy.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/ProjectRWProxy.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/ProjectRWProxy.java 2007-03-05 20:42:43 UTC (rev 9987)
@@ -0,0 +1,34 @@
+ /*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.forge.common.projects.proxies;
+
+import org.jboss.forge.common.projects.project.rw.ProjectRW;
+
+/**
+ * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
+ */
+
+public interface ProjectRWProxy {
+
+ public ProjectRW getProjectRW();
+}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/SyncProxy.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/SyncProxy.java 2007-03-05 20:37:36 UTC (rev 9986)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/proxies/SyncProxy.java 2007-03-05 20:42:43 UTC (rev 9987)
@@ -25,8 +25,6 @@
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
-import org.jboss.forge.common.projects.project.Project;
-
/**
* @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
*/
@@ -37,12 +35,17 @@
public static Object newInstance(Object obj) {
-
- //System.out.println("sync new instance " + obj.getClass().getName());
+
+ // hack to use dynamic proxy with JAXB
+ int n = obj.getClass().getInterfaces().length;
+ Class[] interfaces = new Class[n + 1];
+
+ interfaces = obj.getClass().getInterfaces();
+ interfaces[interfaces.length - 1] = ProjectRWProxy.class;
return java.lang.reflect.Proxy.newProxyInstance(
obj.getClass().getClassLoader(),
- obj.getClass().getInterfaces(),
+ interfaces,
new SyncProxy(obj));
}
@@ -54,10 +57,10 @@
public Object invoke(Object proxy, Method m, Object[] args)
throws Throwable {
- //System.out.println("sync invoke " + m.getDeclaringClass().getName() + " " + m.getName());
-
- if (obj instanceof Project) {
- //System.out.println("sync PROJECT: " + ((Project) obj).getId());
+ // hack continued
+ if (m.getName().equals("getProjectRW")) {
+
+ return obj;
}
Object result;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java 2007-03-05 20:37:36 UTC (rev 9986)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java 2007-03-05 20:42:43 UTC (rev 9987)
@@ -41,14 +41,9 @@
import org.jboss.forge.common.projects.project.Pages;
import org.jboss.forge.common.projects.project.Polls;
import org.jboss.forge.common.projects.project.Project;
-import org.jboss.forge.common.projects.project.rw.DevelopersRW;
-import org.jboss.forge.common.projects.project.rw.DownloadsRW;
-import org.jboss.forge.common.projects.project.rw.PagesRW;
-import org.jboss.forge.common.projects.project.rw.PollsRW;
-import org.jboss.forge.common.projects.project.rw.ProjectRW;
+import org.jboss.forge.common.projects.proxies.ProjectRWProxy;
import org.jboss.forge.common.ejb3.ProjectsServiceRW;
import org.jboss.forge.common.Constants;
-import org.jboss.forge.common.ForgeHelper;
import org.jboss.logging.Logger;
@@ -146,8 +141,11 @@
getNode(ProjectsHelper.PROJECT_DESC);
OutputStream os = node.getOutputStream();
- m.marshal(project,os);
+ // Dynamic proxy implements ProjectRWProxy interface
+ // only to do the following.
+ m.marshal( ((ProjectRWProxy) project).getProjectRW() ,os);
+
node.save("[PROJECTSSERVICERW] Persisting "+project.getId()+" project.");
log.info("Project "+project.getId()+" has been updated.");
More information about the jboss-svn-commits
mailing list