Menu
▾
▴
jboss-cvs-commits — CVS commits for JBoss
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(544) |
May
(1715) |
Jun
(1059) |
Jul
(886) |
Aug
(1214) |
Sep
(1375) |
Oct
(1664) |
Nov
(1153) |
Dec
(1084) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(1630) |
Feb
(1634) |
Mar
(1979) |
Apr
(1119) |
May
(1850) |
Jun
(1231) |
Jul
(1168) |
Aug
(1840) |
Sep
(1038) |
Oct
(1127) |
Nov
(1458) |
Dec
(854) |
| 2004 |
Jan
(1145) |
Feb
(1064) |
Mar
(2242) |
Apr
(1728) |
May
(1346) |
Jun
(1280) |
Jul
(1681) |
Aug
(2388) |
Sep
(2233) |
Oct
(3246) |
Nov
(3248) |
Dec
(1775) |
| 2005 |
Jan
(3407) |
Feb
(3049) |
Mar
(2402) |
Apr
(3687) |
May
(3289) |
Jun
(5731) |
Jul
(3905) |
Aug
(5843) |
Sep
(5149) |
Oct
(6866) |
Nov
(4051) |
Dec
(4646) |
| 2006 |
Jan
(7356) |
Feb
(4713) |
Mar
(9447) |
Apr
(6553) |
May
(6206) |
Jun
(4301) |
Jul
(1160) |
Aug
(23) |
Sep
(11) |
Oct
(19) |
Nov
(26) |
Dec
(15) |
| 2007 |
Jan
(28) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 00:35:46
|
User: julien
Date: 06/07/08 20:35:44
Modified: core/src/main/org/jboss/portal/core/command/mapper
DelegatingURLFactoryService.java URLFactory.java
Log:
simplification : make the URLFactory return a ServerURL instead of a string URL
Revision Changes Path
1.6 +4 -5 jboss-portal/core/src/main/org/jboss/portal/core/command/mapper/DelegatingURLFactoryService.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DelegatingURLFactoryService.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/mapper/DelegatingURLFactoryService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- DelegatingURLFactoryService.java 10 Mar 2006 17:37:18 -0000 1.5
+++ DelegatingURLFactoryService.java 9 Jul 2006 00:35:44 -0000 1.6
@@ -22,8 +22,7 @@
package org.jboss.portal.core.command.mapper;
import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.request.URLContext;
-import org.jboss.portal.server.request.URLFormat;
+import org.jboss.portal.server.ServerURL;
import org.jboss.portal.core.command.ControllerCommand;
import java.util.Map;
@@ -33,14 +32,14 @@
/**
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class DelegatingURLFactoryService extends AbstractURLFactory implements DelegatingURLFactory
{
private Map delegates = new HashMap();
- public String doMapping(ServerInvocation invocation, ControllerCommand cmd, URLContext urlContext, URLFormat format)
+ public ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd)
{
if (cmd == null)
{
@@ -54,7 +53,7 @@
}
if (delegate != null)
{
- return delegate.doMapping(invocation, cmd, urlContext, format);
+ return delegate.doMapping(invocation, cmd);
}
else
{
1.5 +4 -4 jboss-portal/core/src/main/org/jboss/portal/core/command/mapper/URLFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: URLFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/mapper/URLFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- URLFactory.java 10 Mar 2006 17:37:18 -0000 1.4
+++ URLFactory.java 9 Jul 2006 00:35:44 -0000 1.5
@@ -22,13 +22,14 @@
package org.jboss.portal.core.command.mapper;
import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.server.ServerURL;
import org.jboss.portal.server.request.URLContext;
import org.jboss.portal.server.request.URLFormat;
import org.jboss.portal.core.command.ControllerCommand;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public interface URLFactory
{
@@ -37,8 +38,7 @@
*
* @param invocation the invocation
* @param cmd the command to encode
- * @param urlContext
- * @return the encoded url or null if this mapper cannot peform this operation
+ * @return the server url or null if this mapper cannot peform this operation
*/
- String doMapping(ServerInvocation invocation, ControllerCommand cmd, URLContext urlContext, URLFormat format);
+ ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd);
}
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 00:35:46
|
User: julien
Date: 06/07/08 20:35:44
Modified: core/src/main/org/jboss/portal/core/model/portal
PortalObjectURLFactory.java
Log:
simplification : make the URLFactory return a ServerURL instead of a string URL
Revision Changes Path
1.19 +5 -7 jboss-portal/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortalObjectURLFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- PortalObjectURLFactory.java 23 Jun 2006 16:17:26 -0000 1.18
+++ PortalObjectURLFactory.java 9 Jul 2006 00:35:44 -0000 1.19
@@ -33,8 +33,7 @@
import org.jboss.portal.portlet.PortletRequestDecoder;
import org.jboss.portal.server.AbstractServerURL;
import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.request.URLContext;
-import org.jboss.portal.server.request.URLFormat;
+import org.jboss.portal.server.ServerURL;
import org.jboss.portal.server.util.Parameters;
import java.util.Iterator;
@@ -42,7 +41,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
*/
public class PortalObjectURLFactory extends URLFactoryDelegate
{
@@ -76,7 +75,7 @@
return PortalObjectURLFactory.COMMAND_CLASS_NAMES;
}
- public String doMapping(ServerInvocation invocation, ControllerCommand cmd, URLContext urlContext, URLFormat format)
+ public ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd)
{
if (cmd == null)
{
@@ -86,8 +85,7 @@
{
RenderPageCommand rpCmd = (RenderPageCommand)cmd;
String pageRef = rpCmd.getPageRef();
- AbstractServerURL baseURL = getBaseURL(pageRef);
- return invocation.getResponse().encodeURL(baseURL, urlContext, format);
+ return getBaseURL(pageRef);
}
else if (cmd instanceof InvokeWindowCommand)
{
@@ -200,7 +198,7 @@
}
//
- return invocation.getResponse().encodeURL(baseURL, urlContext, format);
+ return baseURL;
}
else
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 00:35:46
|
User: julien
Date: 06/07/08 20:35:43
Modified: core/src/main/org/jboss/portal/core CoreController.java
Log:
simplification : make the URLFactory return a ServerURL instead of a string URL
Revision Changes Path
1.54 +4 -2 jboss-portal/core/src/main/org/jboss/portal/core/CoreController.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CoreController.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/CoreController.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- CoreController.java 4 Jul 2006 10:07:50 -0000 1.53
+++ CoreController.java 9 Jul 2006 00:35:43 -0000 1.54
@@ -31,6 +31,7 @@
import org.jboss.portal.server.RequestController;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.server.ServerException;
+import org.jboss.portal.server.ServerURL;
import org.jboss.portal.server.request.URLContext;
import org.jboss.portal.theme.page.PageService;
@@ -41,7 +42,7 @@
*
* @author <a href="mailto:mho...@no...">Martin Holzner</a>
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.53 $
+ * @version $Revision: 1.54 $
*/
public class CoreController extends AbstractJBossService implements RequestController
{
@@ -133,7 +134,8 @@
else
{
urlContext = URLContext.newInstance(urlContext.getSecure(), true);
- String url = getURLFactory().doMapping(invocation, cmd, urlContext, null);
+ ServerURL serverURL = getURLFactory().doMapping(invocation, cmd);
+ String url = invocation.getResponse().encodeURL(serverURL, urlContext, null);
sendRedirect(invocation, url);
}
}
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 00:35:46
|
User: julien
Date: 06/07/08 20:35:44
Modified: core/src/main/org/jboss/portal/core/cms
CMSObjectURLFactory.java
Log:
simplification : make the URLFactory return a ServerURL instead of a string URL
Revision Changes Path
1.8 +4 -5 jboss-portal/core/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CMSObjectURLFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- CMSObjectURLFactory.java 12 Apr 2006 13:46:36 -0000 1.7
+++ CMSObjectURLFactory.java 9 Jul 2006 00:35:43 -0000 1.8
@@ -26,12 +26,11 @@
import org.jboss.portal.core.cms.command.StreamContentCommand;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.server.AbstractServerURL;
-import org.jboss.portal.server.request.URLContext;
-import org.jboss.portal.server.request.URLFormat;
+import org.jboss.portal.server.ServerURL;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class CMSObjectURLFactory extends URLFactoryDelegate
{
@@ -57,7 +56,7 @@
return COMMAND_CLASS_NAMES;
}
- public String doMapping(ServerInvocation invocation, ControllerCommand cmd, URLContext urlContext, URLFormat format)
+ public ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd)
{
if (cmd == null)
{
@@ -71,7 +70,7 @@
buffer.append(scc.getPath());
AbstractServerURL asu = new AbstractServerURL();
asu.setPortalRequestPath(buffer.toString());
- return invocation.getResponse().encodeURL(asu, urlContext, format);
+ return asu;
}
else
{
|
|
From: Ben W. <bw...@jb...> - 2006-07-08 17:41:29
|
User: bwang
Date: 06/07/08 13:41:28
Modified: src/resources jboss-aop.xml
Log:
First cut for POJO event notification.
Revision Changes Path
1.9 +26 -2 JBossCache/src/resources/jboss-aop.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: jboss-aop.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/resources/jboss-aop.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- jboss-aop.xml 7 Jul 2006 09:33:55 -0000 1.8
+++ jboss-aop.xml 8 Jul 2006 17:41:28 -0000 1.9
@@ -51,15 +51,39 @@
-->
<!-- If a POJO has PojoCachable annotation, it will be asepctized. -->
- <prepare expr="field(* @org.jboss.cache.aop.annotation.PojoCacheable->*)" />
+ <prepare expr="field(* @org.jboss.cache.pojo.annotation.PojoCacheable->*)" />
<!--
Supports inheritance and polymorphism. It can either be a concrete class
or an interface. All sub-classes or interface implementors will be instrumeneted.
-->
- <prepare expr="field(* $instanceof{@org.jboss.cache.aop.annotation.InstanceOfPojoCacheable}->*)" />
+ <prepare expr="field(* $instanceof{@org.jboss.cache.pojo.annotation.InstanceOfPojoCacheable}->*)" />
+ <!-- Observer and Observable to monitor field modification -->
+ <bind pointcut="
+ set(* $instanceof{@org.jboss.cache.pojo.annotation.InstanceOfPojoCacheable}->*) OR
+ set(* @org.jboss.cache.pojo.annotation.PojoCacheable->*)
+ ">
+ <interceptor class="org.jboss.cache.pojo.observable.SubjectInterceptor"/>
+ </bind>
+
+ <introduction class="$instanceof{@org.jboss.cache.pojo.annotation.InstanceOfPojoCacheable}">
+ <mixin>
+ <interfaces>org.jboss.cache.pojo.observable.Subject</interfaces>
+ <class>org.jboss.cache.pojo.observable.SubjectImpl</class>
+ <construction>new org.jboss.cache.pojo.observable.SubjectImpl(this)</construction>
+ </mixin>
+ </introduction>
+
+ <introduction class="@org.jboss.cache.pojo.annotation.PojoCacheable">
+ <mixin>
+ <interfaces>org.jboss.cache.pojo.observable.Subject</interfaces>
+ <class>org.jboss.cache.pojo.observable.SubjectImpl</class>
+ <construction>new org.jboss.cache.pojo.observable.SubjectImpl(this)</construction>
+ </mixin>
+ </introduction>
+
<!--
This defines the PojoCache 2.0 interceptor stack.
-->
|
|
From: Ben W. <bw...@jb...> - 2006-07-08 17:41:22
|
User: bwang
Date: 06/07/08 13:41:16
Added: src-50/org/jboss/cache/pojo/observable Observer.java
Subject.java SubjectImpl.java
SubjectInterceptor.java
Log:
First cut for POJO event notification.
Revision Changes Path
1.1 date: 2006/07/08 17:41:16; author: bwang; state: Exp;JBossCache/src-50/org/jboss/cache/pojo/observable/Observer.java
Index: Observer.java
===================================================================
/*
* 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.cache.pojo.observable;
import java.lang.reflect.Field;
/**
* An Observer. Implement this interface to register
* for subject changes.
*
* A variant of
* {@link org.jboss.aspects.patterns.observable}. We need to
* customize it for including field information and pre-
* and post-notification.
*
* @author Ben Wang
* @version $Revision: 1.1 $
*/
public interface Observer
{
/**
* Notification that a subject has changed
*
* @param subject the subject
* @param modifiedField the field that gets modified
* @param pre True if before modification
*/
void fireChange(Subject subject, Field modifiedField, boolean pre);
}
1.1 date: 2006/07/08 17:41:16; author: bwang; state: Exp;JBossCache/src-50/org/jboss/cache/pojo/observable/Subject.java
Index: Subject.java
===================================================================
/*
* 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.cache.pojo.observable;
import java.lang.reflect.Field;
/**
* A Subject. This interface is exposed on the advised object.
*
* @author Ben Wang
* @version $Revision: 1.1 $
*/
public interface Subject
{
/**
* Add an observer
*
* @param observer the observer
*/
void addObserver(Observer observer);
/**
* Remove an observer
*
* @param observer the observer
*/
void removeObserver(Observer observer);
/**
* Notify all observers
*/
void notifyObservers(Field modifiedField, boolean pre);
}
1.1 date: 2006/07/08 17:41:16; author: bwang; state: Exp;JBossCache/src-50/org/jboss/cache/pojo/observable/SubjectImpl.java
Index: SubjectImpl.java
===================================================================
/*
* 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.cache.pojo.observable;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.lang.reflect.Field;
/**
* The subject implementation.
*
* @author Ben Wang
* @version $Revision: 1.1 $
*/
public class SubjectImpl implements Subject
{
/** The observers */
private Set observers = Collections.synchronizedSet(new HashSet());
/** The subject */
private Object subject;
public SubjectImpl(Object subject)
{
this.subject = subject;
}
public void addObserver(Observer observer)
{
if(observers.contains(observer))
return; // return right away since we have that already.
observers.add(observer);
}
public void removeObserver(Observer observer)
{
observers.remove(observer);
}
public void notifyObservers(Field modifiedField, boolean pre)
{
Subject obj = (Subject) subject;
synchronized (observers)
{
for (Iterator i = observers.iterator(); i.hasNext();)
{
Observer observer = (Observer) i.next();
observer.fireChange(obj, modifiedField, pre);
}
}
}
}
1.1 date: 2006/07/08 17:41:16; author: bwang; state: Exp;JBossCache/src-50/org/jboss/cache/pojo/observable/SubjectInterceptor.java
Index: SubjectInterceptor.java
===================================================================
/*
* 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.cache.pojo.observable;
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.FieldInvocation;
import org.jboss.aop.joinpoint.Invocation;
/**
* A Subject Interceptor. Traps changes to the object
* and fires change notifications.
*
* @author Ben Wang
* @version $Revision: 1.1 $
*/
public class SubjectInterceptor implements Interceptor
{
static boolean PRE = true;
public String getName()
{
return "Observerable";
}
public Object invoke(Invocation invocation) throws Throwable
{
FieldInvocation fi = (FieldInvocation) invocation;
Subject observable = (Subject) fi.getTargetObject();
observable.notifyObservers(fi.getField(), PRE);
Object result = invocation.invokeNext();
observable.notifyObservers(fi.getField(), !PRE);
return result;
}
}
|
|
From: Ben W. <bw...@jb...> - 2006-07-08 17:41:17
|
User: bwang
Date: 06/07/08 13:41:16
Modified: src-50/org/jboss/cache/pojo MethodDeclarations.java
PojoTreeCache.java PojoUtil.java
TreeCacheAopDelegate.java
Log:
First cut for POJO event notification.
Revision Changes Path
1.2 +6 -5 JBossCache/src-50/org/jboss/cache/pojo/MethodDeclarations.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MethodDeclarations.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/MethodDeclarations.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MethodDeclarations.java 7 Jul 2006 09:34:42 -0000 1.1
+++ MethodDeclarations.java 8 Jul 2006 17:41:16 -0000 1.2
@@ -9,6 +9,7 @@
import org.jboss.aop.InstanceAdvisor;
import org.jboss.aop.advice.Interceptor;
+import org.jboss.cache.pojo.observable.Observer;
import java.lang.reflect.Method;
@@ -16,7 +17,7 @@
* Method declarations for undo method mostly.
*
* @author Ben Wang
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class MethodDeclarations
{
@@ -30,13 +31,13 @@
try
{
attachInterceptor = PojoUtil.class.getDeclaredMethod("attachInterceptor",
- new Class[] {InstanceAdvisor.class, Interceptor.class});
+ new Class[] {Object.class, InstanceAdvisor.class, Interceptor.class, Observer.class});
detachInterceptor = PojoUtil.class.getDeclaredMethod("detachInterceptor",
- new Class[] {InstanceAdvisor.class, Interceptor.class});
+ new Class[] {InstanceAdvisor.class, Interceptor.class, Observer.class});
undoAttachInterceptor = PojoUtil.class.getDeclaredMethod("undoAttachInterceptor",
- new Class[] {InstanceAdvisor.class, Interceptor.class});
+ new Class[] {Object.class, InstanceAdvisor.class, Interceptor.class, Observer.class});
undoDetachInterceptor = PojoUtil.class.getDeclaredMethod("undoDetachInterceptor",
- new Class[] {InstanceAdvisor.class, Interceptor.class});
+ new Class[] {InstanceAdvisor.class, Interceptor.class, Observer.class});
}
catch (NoSuchMethodException ex)
{
1.6 +10 -1 JBossCache/src-50/org/jboss/cache/pojo/PojoTreeCache.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoTreeCache.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/PojoTreeCache.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PojoTreeCache.java 6 Jul 2006 09:25:40 -0000 1.5
+++ PojoTreeCache.java 8 Jul 2006 17:41:16 -0000 1.6
@@ -19,6 +19,7 @@
import org.jboss.cache.marshall.RegionNameConflictException;
import org.jboss.cache.pojo.eviction.AopEvictionPolicy;
import org.jboss.cache.pojo.util.ObjectUtil;
+import org.jboss.cache.pojo.observable.Observer;
import org.jboss.cache.transaction.BatchModeTransactionManager;
import org.jboss.cache.xml.XmlHelper;
import org.jgroups.JChannel;
@@ -45,6 +46,8 @@
private Element config_ = null;
// boolean detachPojoWhenEvicted_ = false;
private boolean marshallNonSerializable_ = false;
+ // Observer for field event notification
+ private Observer observer_;
public PojoTreeCache(String cluster_name,
String props,
@@ -60,6 +63,12 @@
init();
}
+ public PojoTreeCache(Observer observer) throws Exception
+ {
+ observer_ = observer;
+ init();
+ }
+
public PojoTreeCache(JChannel channel) throws Exception
{
super(channel);
@@ -68,7 +77,7 @@
private void init()
{
- delegate_ = new TreeCacheAopDelegate(this);
+ delegate_ = new TreeCacheAopDelegate(this, observer_);
}
@Override
1.4 +28 -5 JBossCache/src-50/org/jboss/cache/pojo/PojoUtil.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoUtil.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/PojoUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PojoUtil.java 7 Jul 2006 09:34:42 -0000 1.3
+++ PojoUtil.java 8 Jul 2006 17:41:16 -0000 1.4
@@ -11,36 +11,59 @@
import org.jboss.aop.advice.Interceptor;
import org.jboss.cache.CacheException;
import org.jboss.cache.pojo.annotation.TxUndo;
+import org.jboss.cache.pojo.observable.Observer;
+import org.jboss.cache.pojo.observable.Subject;
+import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor;
import java.lang.reflect.Field;
/**
* Utility class for method wrappers that we are interested to rollback (i.e., undo).
* @author Ben Wang
- * @version $Id: PojoUtil.java,v 1.3 2006/07/07 09:34:42 bwang Exp $
+ * @version $Id: PojoUtil.java,v 1.4 2006/07/08 17:41:16 bwang Exp $
*/
public class PojoUtil
{
@TxUndo
- public void attachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
+ public void attachInterceptor(Object pojo, InstanceAdvisor advisor, Interceptor interceptor,
+ Observer observer)
{
advisor.appendInterceptor(interceptor);
+ // add the observer
+ ((Subject)pojo).addObserver(observer);
}
@TxUndo
- public void detachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
+ public void detachInterceptor(InstanceAdvisor advisor, Interceptor interceptor, Observer observer)
{
advisor.removeInterceptor(interceptor.getName());
+ // retrieve pojo
+ Object pojo = ((CacheFieldInterceptor)interceptor).getAopInstance().get();
+
+ if(pojo == null)
+ {
+ throw new PojoCacheException("PojoUtil.detachInterceptor(): null pojo");
+ }
+
+ ((Subject)pojo).removeObserver(observer);
}
- public void undoAttachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
+ public void undoAttachInterceptor(Object pojo, InstanceAdvisor advisor, Interceptor interceptor,
+ Observer observer)
{
advisor.removeInterceptor(interceptor.getName());
+ ((Subject)pojo).removeObserver(observer);
}
- public void undoDetachInterceptor(InstanceAdvisor advisor, Interceptor interceptor)
+ public void undoDetachInterceptor(InstanceAdvisor advisor, Interceptor interceptor, Observer observer)
{
advisor.appendInterceptor(interceptor);
+ Object pojo = ((CacheFieldInterceptor)interceptor).getAopInstance().get();
+ if(pojo == null)
+ {
+ throw new PojoCacheException("PojoUtil.detachInterceptor(): null pojo");
+ }
+ ((Subject)pojo).addObserver(observer);
}
1.9 +9 -5 JBossCache/src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeCacheAopDelegate.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- TreeCacheAopDelegate.java 7 Jul 2006 10:36:44 -0000 1.8
+++ TreeCacheAopDelegate.java 8 Jul 2006 17:41:16 -0000 1.9
@@ -21,6 +21,7 @@
import org.jboss.cache.pojo.util.AopUtil;
import org.jboss.cache.pojo.interceptors.dynamic.BaseInterceptor;
import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor;
+import org.jboss.cache.pojo.observable.Observer;
import java.lang.reflect.Field;
import java.util.Collection;
@@ -47,14 +48,17 @@
private ThreadLocal<Boolean> bulkRemove_ = new ThreadLocal<Boolean>();
private final String DETACH = "DETACH";
private PojoUtil util_ = new PojoUtil();
+ // Observer for field event notification
+ private Observer observer_;
- public TreeCacheAopDelegate(PojoTreeCache cache)
+ public TreeCacheAopDelegate(PojoTreeCache cache, Observer observer)
{
cache_ = cache;
internal_ = new InternalDelegate(cache);
graphHandler_ = new ObjectGraphHandler(cache_, internal_, this);
collectionHandler_ = new CollectionClassHandler(cache_, internal_, graphHandler_);
serializableHandler_ = new SerializableObjectHandler(cache_, internal_);
+ observer_ = observer;
}
public void setBulkRemove(boolean bulk)
@@ -134,7 +138,7 @@
InstanceAdvisor advisor = ((Advised) obj)._getInstanceAdvisor();
CacheFieldInterceptor interceptor = new CacheFieldInterceptor(cache_, fqn, type);
interceptor.setAopInstance(aopInstance);
- util_.attachInterceptor(advisor, interceptor);
+ util_.attachInterceptor(obj, advisor, interceptor, observer_);
} else
{ // Must be Collection classes. We will use aop.ClassProxy instance instead.
try
@@ -256,7 +260,7 @@
{
if (!detachOnly)
{
- util_.detachInterceptor(advisor, interceptor);
+ util_.detachInterceptor(advisor, interceptor, observer_);
undoMap.put(advisor, interceptor);
} else
{
@@ -419,7 +423,7 @@
// Insert interceptor at runtime
CacheFieldInterceptor interceptor = new CacheFieldInterceptor(cache_, fqn, type);
interceptor.setAopInstance(aopInstance);
- util_.attachInterceptor(advisor, interceptor);
+ util_.attachInterceptor(obj, advisor, interceptor, observer_);
map.put(AOPInstance.KEY, aopInstance);
// This is put into map first.
@@ -613,7 +617,7 @@
{
log.debug("regularRemoveObject(): removed cache interceptor fqn: " + fqn + " interceptor: " + interceptor);
}
- util_.detachInterceptor(advisor, interceptor);
+ util_.detachInterceptor(advisor, interceptor, observer_);
}
}
|
|
From: Ben W. <bw...@jb...> - 2006-07-08 17:41:17
|
User: bwang
Date: 06/07/08 13:41:15
Modified: src-50/org/jboss/cache/pojo/impl PojoCacheImpl.java
Log:
First cut for POJO event notification.
Revision Changes Path
1.6 +90 -9 JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoCacheImpl.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PojoCacheImpl.java 6 Jul 2006 02:42:35 -0000 1.5
+++ PojoCacheImpl.java 8 Jul 2006 17:41:15 -0000 1.6
@@ -14,27 +14,44 @@
import org.jboss.cache.pojo.PojoCacheException;
import org.jboss.cache.pojo.PojoCacheListener;
import org.jboss.cache.pojo.PojoTreeCache;
+import org.jboss.cache.pojo.observable.Observer;
+import org.jboss.cache.pojo.observable.Subject;
import org.jboss.cache.pojo.annotation.CheckIdValidity;
-import org.jboss.cache.pojo.annotation.Tx;
import java.util.Collection;
import java.util.Map;
+import java.util.Set;
+import java.util.Collections;
+import java.util.Iterator;
+import java.lang.reflect.Field;
+
+import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
/**
* Implementation class for PojoCache interface
*
* @author Ben Wang
- * @version $Id: PojoCacheImpl.java,v 1.5 2006/07/06 02:42:35 bwang Exp $
+ * @version $Id: PojoCacheImpl.java,v 1.6 2006/07/08 17:41:15 bwang Exp $
*/
-public class PojoCacheImpl implements PojoCache
+public class PojoCacheImpl implements PojoCache, Observer
{
private PojoTreeCache cache_ = null;
+ /**
+ * Set of TreeCacheListener.
+ *
+ * @see #addListener
+ */
+ private final Set listeners = new CopyOnWriteArraySet();
+ /**
+ * True if listeners are initialized.
+ */
+ protected boolean hasListeners = false;
public PojoCacheImpl(String configStr)
{
try
{
- cache_ = new PojoTreeCache();
+ cache_ = new PojoTreeCache(this);
PropertyConfigurator config = new PropertyConfigurator();
config.configure(cache_, configStr);
} catch (Exception e)
@@ -51,7 +68,10 @@
{
try
{
- return cache_.putObject(id, pojo);
+ notifyAttach(pojo, true);
+ Object obj = cache_.putObject(id, pojo);
+ notifyAttach(pojo, false);
+ return obj;
} catch (CacheException e)
{
e.printStackTrace();
@@ -64,7 +84,11 @@
{
try
{
- return cache_.removeObject(id);
+ Object pojo = find(id); // TODO need optimization here since it will be redundant here
+ notifyDetach(pojo, true);
+ Object obj = cache_.removeObject(id);
+ notifyDetach(pojo, false);
+ return obj;
} catch (CacheException e)
{
e.printStackTrace(); // TODO
@@ -122,17 +146,33 @@
public void addListener(PojoCacheListener listener)
{
- throw new RuntimeException("addListener not yet implemented");
+ // synchronize on listenrs just to
+ // ensure hasListeners is set correctly
+ // based on possibility of concurrent adds/removes
+ //
+ synchronized (listeners)
+ {
+ listeners.add(listener);
+ hasListeners = true;
+ }
}
public Collection getListeners()
{
- throw new RuntimeException("getListeners not yet implemented");
+ return Collections.unmodifiableCollection(listeners);
}
public void removeListener(PojoCacheListener listener)
{
- throw new RuntimeException("removeListener not yet implemented");
+ // synchronize on listenrs just to
+ // ensure hasListeners is set correctly
+ // based on possibility of concurrent adds/removes
+ //
+ synchronized (listeners)
+ {
+ listeners.remove(listener);
+ hasListeners = !listeners.isEmpty();
+ }
}
public TreeCache getCache()
@@ -140,4 +180,45 @@
// TODO Need to return the real Cache interface later on.
return cache_;
}
+
+ /********************************************************************************
+ * Internal API
+ ********************************************************************************/
+
+ /**
+ * Callback for Observable to notify of field modification
+ * @param subject
+ */
+ public void fireChange(Subject subject, Field modifiedField, boolean pre)
+ {
+ boolean isLocal = true; // TODO Not yet supported. Always true now.
+ if (hasListeners)
+ {
+ for (Iterator it = listeners.iterator(); it.hasNext();)
+ ((PojoCacheListener) it.next()).modify((Object)subject, modifiedField, pre, isLocal);
+ }
+
+ }
+
+ protected void notifyAttach(Object pojo, boolean pre)
+ {
+ boolean isLocal = true; // TODO Not yet supported. Always true now.
+ if (hasListeners)
+ {
+ for (Iterator it = listeners.iterator(); it.hasNext();)
+ ((PojoCacheListener) it.next()).attach(pojo, pre, isLocal);
+ }
+
+ }
+
+ protected void notifyDetach(Object pojo, boolean pre)
+ {
+ boolean isLocal = true; // TODO Not yet supported. Always true now.
+ if (hasListeners)
+ {
+ for (Iterator it = listeners.iterator(); it.hasNext();)
+ ((PojoCacheListener) it.next()).detach(pojo, pre, isLocal);
+ }
+
+ }
}
|
|
From: Ben W. <bw...@jb...> - 2006-07-08 17:40:48
|
User: bwang Date: 06/07/08 13:40:46 Log: Directory /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/observable added to the repository |
|
From: Ben W. <bw...@jb...> - 2006-07-08 17:39:50
|
User: bwang
Date: 06/07/08 13:39:39
Added: tests-50/functional/org/jboss/cache/pojo/event
LocalTest.java
Log:
First cut for POJO event notification.
Revision Changes Path
1.1 date: 2006/07/08 17:39:39; author: bwang; state: Exp;JBossCache/tests-50/functional/org/jboss/cache/pojo/event/LocalTest.java
Index: LocalTest.java
===================================================================
/*
* JBoss, Home of Professional Open Source
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.cache.pojo.event;
import junit.framework.TestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.pojo.NewLocalTest;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.cache.pojo.InternalDelegate;
import org.jboss.cache.pojo.PojoCacheListener;
import org.jboss.cache.pojo.test.Person;
import org.jboss.cache.pojo.test.Address;
import java.util.Map;
import java.lang.reflect.Field;
/**
* Additional basic tests
*
* @author Ben Wang
*/
public class LocalTest extends TestCase
{
Log log_ = LogFactory.getLog(LocalTest.class);
PojoCache cache_;
static Throwable ex1_;
static boolean pre_;
static boolean post_;
static int counter_;
public LocalTest(String name)
{
super(name);
}
protected void setUp() throws Exception
{
super.setUp();
log_.info("setUp() ....");
String configFile = "META-INF/local-service.xml";
cache_ = PojoCacheFactory.createInstance(configFile);
cache_.start();
reset();
}
private void reset()
{
ex1_ = null;
pre_ = false;
post_ = false;
counter_ = 0;
}
protected void tearDown() throws Exception
{
super.tearDown();
cache_.stop();
}
// public void testDummy() {}
public void testAttachNotification() throws Exception
{
log_.info("testAttachNotification() ....");
Person test = new Person();
test.setName("Ben");
test.setAge(10);
MyListener listener = new MyListener(test);
cache_.addListener(listener);
cache_.attach("/a", test);
assertNull("Exception should be null but " +ex1_, ex1_);
assertTrue("pre-attach event is not emitted", pre_);
assertTrue("post-attach event is not emitted", post_);
assertEquals("Total number of event is ", 2, counter_);
cache_.removeListener(listener);
}
public void testAttachNotification2() throws Exception
{
log_.info("testAttachNotification2() ....");
Person test = new Person();
test.setName("Ben");
test.setAge(10);
Address addr = new Address();
test.setAddress(addr);
MyListener listener = new MyListener(test);
cache_.addListener(listener);
cache_.attach("/a", test);
assertNull("Exception should be null but " +ex1_, ex1_);
assertTrue("pre-attach event is not emitted", pre_);
assertTrue("post-attach event is not emitted", post_);
assertEquals("Total number of event is ", 4, counter_);
cache_.removeListener(listener);
}
public void testDetachNotification() throws Exception
{
log_.info("testDetachNotification() ....");
Person test = new Person();
test.setName("Ben");
test.setAge(10);
MyListener listener = new MyListener(test);
cache_.addListener(listener);
cache_.attach("/a", test);
assertNull("Exception should be null but " +ex1_, ex1_);
assertTrue("pre-attach event is not emitted", pre_);
assertTrue("post-attach event is not emitted", post_);
reset();
cache_.detach("/a");
assertNull("Exception should be null but " +ex1_, ex1_);
assertTrue("pre-detach event is not emitted", pre_);
assertTrue("post-detach event is not emitted", post_);
cache_.removeListener(listener);
}
public void testFieldNotification() throws Exception
{
log_.info("testAttachNotification() ....");
Person test = new Person();
test.setName("Ben");
test.setAge(10);
MyListener listener = new MyListener(test);
cache_.addListener(listener);
cache_.attach("/a", test);
assertNull("Exception should be null but " +ex1_, ex1_);
assertTrue("pre-attach event is not emitted", pre_);
assertTrue("post-attach event is not emitted", post_);
reset();
// Field modification
test.setAge(20);
assertNull("Exception should be null but " +ex1_, ex1_);
assertTrue("pre-attach event is not emitted", pre_);
assertTrue("post-attach event is not emitted", post_);
assertEquals("Total number of event is ", 2, counter_);
cache_.removeListener(listener);
}
public static Test suite() throws Exception
{
return new TestSuite(LocalTest.class);
}
public static void main(String[] args) throws Exception
{
junit.textui.TestRunner.run(LocalTest.suite());
}
public class MyListener implements PojoCacheListener
{
Object pojo;
public MyListener(Object pojo)
{
this.pojo = pojo;
}
public void attach(Object pojo, boolean pre, boolean isLocal)
{
if(pojo != this.pojo)
{
ex1_ = new RuntimeException("Pojo not identical");
}
if(pre)
{
pre_ = true;
counter_++;
} else
{
post_ = true;
counter_++;
}
}
public void detach(Object pojo, boolean pre, boolean isLocal)
{
if(pojo != this.pojo)
{
ex1_ = new RuntimeException("Pojo not identical");
}
if(pre)
{
pre_ = true;
counter_++;
} else
{
post_ = true;
counter_++;
}
}
public void modify(Object pojo, Field field, boolean pre, boolean isLocal)
{
if(pojo != this.pojo)
{
ex1_ = new RuntimeException("Pojo not identical");
}
if(pre)
{
pre_ = true;
counter_++;
} else
{
post_ = true;
counter_++;
}
}
public void passivate(Object pojo, boolean pre)
{
throw new RuntimeException("passivate event not yet supported.");
}
public void evict(Object pojo, boolean pre)
{
throw new RuntimeException("evict event not yet supported.");
}
public void activate(Object pojo, boolean pre)
{
throw new RuntimeException("activate event not yet supported.");
}
}
}
|
|
From: Ben W. <bw...@jb...> - 2006-07-08 17:31:55
|
User: bwang
Date: 06/07/08 13:31:52
Modified: tests-50/functional/org/jboss/cache/pojo/test Address.java
Log:
Changed annotation to pojo from aop.
Revision Changes Path
1.3 +2 -2 JBossCache/tests-50/functional/org/jboss/cache/pojo/test/Address.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Address.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/test/Address.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Address.java 27 Jun 2006 09:19:31 -0000 1.2
+++ Address.java 8 Jul 2006 17:31:52 -0000 1.3
@@ -10,14 +10,14 @@
/**
* Test class for PojoCache.
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
* <p>Below is the annotation that signifies this class is "prepared" under JBossAop. This is used in
* conjunction with a special jboss-aop.xml (supplied by JBossCache). In addition, this is JDK1.4 style,
* so a annoc Ant build target is needed to pre-compile it.</p>
* <p>To use this approach, just apply this line to your pojo and run annoc (and possibly aopc).</p>
*/
// We are using JDK1.5 annotation.
-...@or...notation.PojoCacheable
+...@or...notation.PojoCacheable
public class Address
{
String street = null;
|
|
From: Ben W. <bw...@jb...> - 2006-07-08 17:31:55
|
User: bwang
Date: 06/07/08 13:31:52
Modified: tests-50/functional/org/jboss/cache/pojo/test/propagation
Node.java PropagationManager.java StateItem.java
Log:
Changed annotation to pojo from aop.
Revision Changes Path
1.3 +1 -1 JBossCache/tests-50/functional/org/jboss/cache/pojo/test/propagation/Node.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Node.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/test/propagation/Node.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Node.java 27 Jun 2006 09:19:31 -0000 1.2
+++ Node.java 8 Jul 2006 17:31:52 -0000 1.3
@@ -6,7 +6,7 @@
* Main interface for network sensor supervising example.
*/
// We are using JDK1.5 annotation.
-...@or...stanceOfPojoCacheable
+...@or...stanceOfPojoCacheable
public interface Node
{
public void setNodeRDN(String rdn);
1.3 +1 -1 JBossCache/tests-50/functional/org/jboss/cache/pojo/test/propagation/PropagationManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PropagationManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/test/propagation/PropagationManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PropagationManager.java 27 Jun 2006 09:19:31 -0000 1.2
+++ PropagationManager.java 8 Jul 2006 17:31:52 -0000 1.3
@@ -4,7 +4,7 @@
*
*/
// We are using JDK1.5 annotation.
-...@or...stanceOfPojoCacheable
+...@or...stanceOfPojoCacheable
public interface PropagationManager
{
public void setRootNode(String rdn);
1.3 +1 -1 JBossCache/tests-50/functional/org/jboss/cache/pojo/test/propagation/StateItem.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StateItem.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/test/propagation/StateItem.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- StateItem.java 27 Jun 2006 09:19:31 -0000 1.2
+++ StateItem.java 8 Jul 2006 17:31:52 -0000 1.3
@@ -4,7 +4,7 @@
*
*/
// We are using JDK1.5 annotation.
-...@or...stanceOfPojoCacheable
+...@or...stanceOfPojoCacheable
public interface StateItem
{
public static final boolean STATE_CHANGED = true;
|
|
From: Weston P. <wes...@jb...> - 2006-07-08 14:17:30
|
User: wprice
Date: 06/07/08 10:17:25
Modified: src/main/org/jboss/resource/adapter/jdbc
BaseWrapperManagedConnection.java
Log:
Code comments and cleanup.
Revision Changes Path
1.22 +77 -65 jbosscx/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BaseWrapperManagedConnection.java
===================================================================
RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- BaseWrapperManagedConnection.java 31 May 2006 22:39:46 -0000 1.21
+++ BaseWrapperManagedConnection.java 8 Jul 2006 14:17:25 -0000 1.22
@@ -1,24 +1,24 @@
/*
-* 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.
-*/
+ * 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.resource.adapter.jdbc;
import java.io.PrintWriter;
@@ -54,48 +54,59 @@
*
* @author <a href="mailto:d_j...@us...">David Jencks</a>
* @author <a href="mailto:ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.21 $
+ * @author <a href="mailto:wes...@jb...>Weston Price</a>
+ * @version $Revision: 1.22 $
*/
-public abstract class BaseWrapperManagedConnection
- implements ManagedConnection
+public abstract class BaseWrapperManagedConnection implements ManagedConnection
{
protected final BaseWrapperManagedConnectionFactory mcf;
+
protected final Connection con;
+
protected final Properties props;
+
private final int transactionIsolation;
+
private final boolean readOnly;
private final Collection cels = new ArrayList();
+
private final Set handles = new HashSet();
+
private PreparedStatementCache psCache = null;
protected final Object stateLock = new Object();
protected boolean inManagedTransaction = false;
+
protected SynchronizedBoolean inLocalTransaction = new SynchronizedBoolean(false);
+
protected boolean jdbcAutoCommit = true;
+
protected boolean underlyingAutoCommit = true;
+
protected boolean jdbcReadOnly;
+
protected boolean underlyingReadOnly;
+
protected int jdbcTransactionIsolation;
+
protected boolean destroyed = false;
- public BaseWrapperManagedConnection (final BaseWrapperManagedConnectionFactory mcf,
- final Connection con,
- final Properties props,
- final int transactionIsolation,
- final int psCacheSize)
- throws SQLException
+ public BaseWrapperManagedConnection(final BaseWrapperManagedConnectionFactory mcf, final Connection con,
+ final Properties props, final int transactionIsolation, final int psCacheSize) throws SQLException
{
this.mcf = mcf;
this.con = con;
this.props = props;
+
if (psCacheSize > 0)
psCache = new PreparedStatementCache(psCacheSize);
if (transactionIsolation == -1)
this.transactionIsolation = con.getTransactionIsolation();
+
else
{
this.transactionIsolation = transactionIsolation;
@@ -142,8 +153,8 @@
{
if (!(handle instanceof WrappedConnection))
throw new JBossResourceException("Wrong kind of connection handle to associate" + handle);
- ((WrappedConnection)handle).setManagedConnection(this);
- synchronized(handles)
+ ((WrappedConnection) handle).setManagedConnection(this);
+ synchronized (handles)
{
handles.add(handle);
}
@@ -170,9 +181,9 @@
{
synchronized (handles)
{
- for (Iterator i = handles.iterator(); i.hasNext(); )
+ for (Iterator i = handles.iterator(); i.hasNext();)
{
- WrappedConnection lc = (WrappedConnection)i.next();
+ WrappedConnection lc = (WrappedConnection) i.next();
lc.setManagedConnection(null);
}
handles.clear();
@@ -246,6 +257,7 @@
return this.props;
}
+
void closeHandle(WrappedConnection handle)
{
synchronized (stateLock)
@@ -254,20 +266,20 @@
return;
}
- synchronized(handles)
+ synchronized (handles)
{
handles.remove(handle);
}
ConnectionEvent ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
ce.setConnectionHandle(handle);
Collection copy = null;
- synchronized(cels)
+ synchronized (cels)
{
copy = new ArrayList(cels);
}
- for (Iterator i = copy.iterator(); i.hasNext(); )
+ for (Iterator i = copy.iterator(); i.hasNext();)
{
- ConnectionEventListener cel = (ConnectionEventListener)i.next();
+ ConnectionEventListener cel = (ConnectionEventListener) i.next();
cel.connectionClosed(ce);
}
}
@@ -298,13 +310,13 @@
ex = new ResourceAdapterInternalException("Unexpected error", e);
ConnectionEvent ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, ex);
Collection copy = null;
- synchronized(cels)
+ synchronized (cels)
{
copy = new ArrayList(cels);
}
- for (Iterator i = copy.iterator(); i.hasNext(); )
+ for (Iterator i = copy.iterator(); i.hasNext();)
{
- ConnectionEventListener cel = (ConnectionEventListener)i.next();
+ ConnectionEventListener cel = (ConnectionEventListener) i.next();
try
{
cel.connectionErrorOccurred(ce);
@@ -316,8 +328,7 @@
}
}
- Connection getConnection()
- throws SQLException
+ Connection getConnection() throws SQLException
{
if (con == null)
throw new SQLException("Connection has been destroyed!!!");
@@ -328,7 +339,8 @@
{
if (psCache != null)
{
- PreparedStatementCache.Key key = new PreparedStatementCache.Key(sql, PreparedStatementCache.Key.PREPARED_STATEMENT, resultSetType, resultSetConcurrency);
+ PreparedStatementCache.Key key = new PreparedStatementCache.Key(sql,
+ PreparedStatementCache.Key.PREPARED_STATEMENT, resultSetType, resultSetConcurrency);
CachedPreparedStatement cachedps = (CachedPreparedStatement) psCache.get(key);
if (cachedps != null)
{
@@ -358,8 +370,9 @@
{
if (psCache != null)
{
- PreparedStatementCache.Key key = new PreparedStatementCache.Key(sql, PreparedStatementCache.Key.CALLABLE_STATEMENT, resultSetType, resultSetConcurrency);
- CachedCallableStatement cachedps = (CachedCallableStatement)psCache.get(key);
+ PreparedStatementCache.Key key = new PreparedStatementCache.Key(sql,
+ PreparedStatementCache.Key.CALLABLE_STATEMENT, resultSetType, resultSetConcurrency);
+ CachedCallableStatement cachedps = (CachedCallableStatement) psCache.get(key);
if (cachedps != null)
{
if (canUse(cachedps))
@@ -404,8 +417,7 @@
return mcf.log;
}
- private void checkIdentity(Subject subject, ConnectionRequestInfo cri)
- throws ResourceException
+ private void checkIdentity(Subject subject, ConnectionRequestInfo cri) throws ResourceException
{
Properties newProps = mcf.getConnectionProperties(subject, cri);
if (!props.equals(newProps))
@@ -439,7 +451,7 @@
if (jdbcAutoCommit == false && inLocalTransaction.set(true) == false)
{
ArrayList copy;
- synchronized(cels)
+ synchronized (cels)
{
copy = new ArrayList(cels);
}
@@ -476,7 +488,7 @@
boolean isJdbcAutoCommit()
{
- return inManagedTransaction? false: jdbcAutoCommit;
+ return inManagedTransaction ? false : jdbcAutoCommit;
}
void setJdbcAutoCommit(final boolean jdbcAutoCommit) throws SQLException
@@ -491,7 +503,7 @@
if (jdbcAutoCommit && inLocalTransaction.set(false))
{
ArrayList copy;
- synchronized(cels)
+ synchronized (cels)
{
copy = new ArrayList(cels);
}
@@ -554,7 +566,7 @@
if (inLocalTransaction.set(false))
{
ArrayList copy;
- synchronized(cels)
+ synchronized (cels)
{
copy = new ArrayList(cels);
}
@@ -588,7 +600,7 @@
if (inLocalTransaction.set(false))
{
ArrayList copy;
- synchronized(cels)
+ synchronized (cels)
{
copy = new ArrayList(cels);
}
|
|
From: Weston P. <wes...@jb...> - 2006-07-08 14:14:04
|
User: wprice
Date: 06/07/08 10:14:02
Modified: src/main/org/jboss/resource/adapter/jdbc
ExceptionSorter.java
Log:
Code comments and cleanup.
Revision Changes Path
1.6 +18 -2 jbosscx/src/main/org/jboss/resource/adapter/jdbc/ExceptionSorter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ExceptionSorter.java
===================================================================
RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/adapter/jdbc/ExceptionSorter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ExceptionSorter.java 21 Nov 2005 22:29:44 -0000 1.5
+++ ExceptionSorter.java 8 Jul 2006 14:14:02 -0000 1.6
@@ -24,14 +24,30 @@
import java.sql.SQLException;
/**
- * ExceptionSorter
+ * The ExceptionSorter interface allows for <code>java.sql.SQLException</code>
+ * evaluation to determine if an error is fatal.
*
* @author <a href="mailto:d_j...@us...">David Jencks</a>
* @author <a href="mailto:ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.5 $
+ * @author <a href="mailto:wes...@jb...>Weston Price</a>
+ *
+ * @see ValidConnectionChecker
+ * @see CheckValidConnectionSQL
+ *
+ * @version $Revision: 1.6 $
*/
public interface ExceptionSorter
{
+
+
+ /**
+ * Evaluates a <code>java.sql.SQLException</code> to determine if
+ * the error was fatal
+ *
+ * @param e the <code>java.sql.SQLException</code>
+ *
+ * @return whether or not the exception is vatal.
+ */
boolean isExceptionFatal(SQLException e);
}
|
|
From: <for...@jb...> - 2006-07-08 05:00:52
|
Commit from bstansberry on branch Branch_JBossCache_1_4_0 (2006-07-07 03:03 EDT) --------------------------------------------------------- Don't assume the method call is replicate when creating TRACE log message JBossCache src/org/jboss/cache/TreeCache.java 1.195.2.4 Commit from bstansberry on branch Branch_JBossCache_1_4_0 (2006-07-07 03:20 EDT) --------------------------------------------------------- Don't throw CCE extracting an Fqn if a subclass passes in a non-JBC MethodCall JBossCache src/org/jboss/cache/marshall/LegacyTreeCacheMarshaller.java 1.5.2.1 JBossCache src/org/jboss/cache/marshall/TreeCacheMarshaller140.java 1.1.2.1 Commit from bdaw (2006-07-07 03:30 EDT) ---------------- fixed wrong table name in migration app schema jboss-portal migration/src/main/org/jboss/portal/migration/MigrationModule22_24.java 1.21 jboss-portal migration/src/resources/portal-migration-war/WEB-INF/classes/schema24/portal/domain.hbm.xml 1.4 Commit from mculpepper (2006-07-07 04:32 EDT) ---------------------- building the core source should now work jbosside releng/org.jboss.ide.eclipse.releng/builders/core/customTargets.xml 1.9 Commit from aloubyansky (2006-07-07 04:43 EDT) ----------------------- disabled trace jbosstest src/main/org/jboss/test/xml/WildcardUnresolvedElementsUnitTestCase.java 1.9 Commit from bdaw (2006-07-07 04:45 EDT) ---------------- - SecurityInfo interface initial test - failing jboss-portal portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestSuite.java 1.8 + jboss-portal portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 1.1 jboss-portal portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml 1.8 jboss-portal portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml 1.4 Commit from bwang (2006-07-07 05:33 EDT) ----------------- Added undo interceptor stack. JBossCache src/resources/jboss-aop.xml 1.8 + JBossCache src-50/org/jboss/cache/pojo/annotation/TxUndo.java 1.1 JBossCache src-50/org/jboss/cache/pojo/collection/AbstractCollectionInterceptor.java 1.4 JBossCache src-50/org/jboss/cache/pojo/collection/CachedListInterceptor.java 1.4 JBossCache src-50/org/jboss/cache/pojo/collection/CachedMapInterceptor.java 1.4 JBossCache src-50/org/jboss/cache/pojo/collection/CachedSetInterceptor.java 1.4 JBossCache src-50/org/jboss/cache/pojo/interceptors/AbstractInterceptor.java 1.2 JBossCache src-50/org/jboss/cache/pojo/interceptors/PojoTxLockInterceptor.java 1.3 JBossCache src-50/org/jboss/cache/pojo/interceptors/PojoTxUndoInterceptor.java 1.2 + JBossCache src-50/org/jboss/cache/pojo/interceptors/PojoTxUndoSynchronizationInterceptor.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/util/MethodCall.java 1.1 JBossCache src-50/org/jboss/cache/pojo/BaseInterceptor.java 1.4 JBossCache src-50/org/jboss/cache/pojo/CacheInterceptor.java 1.4 + JBossCache src-50/org/jboss/cache/pojo/MethodDeclarations.java 1.1 - JBossCache src-50/org/jboss/cache/pojo/ModificationEntry.java 1.4 JBossCache src-50/org/jboss/cache/pojo/PojoTxSynchronizationHandler.java 1.5 JBossCache src-50/org/jboss/cache/pojo/PojoUtil.java 1.3 JBossCache src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java 1.6 + JBossCache tests-50/functional/org/jboss/cache/pojo/util/MethodCallTest.java 1.1 + JBossCache tests-50/functional/org/jboss/cache/pojo/TxUndoTest.java 1.1 Commit from kkhan (2006-07-07 06:17 EDT) ----------------- Rename the jboss.aop.debug-classes system property to jboss.aop.debug.classes. If set to true, TransformerCommon will call CtClass.debugWriteFile() to output the contents of the class jboss-aop src/main/org/jboss/aop/instrument/TransformerCommon.java 1.15 jboss-aop src/main/org/jboss/aop/AspectManager.java 1.163 Commit from kkhan (2006-07-07 06:19 EDT) ----------------- [JBAOP-226] Resolve memory leaks for the generated advisors. jboss-aop src/test/org/jboss/test/aop/memoryleaks/MemoryLeakTestCase.java 1.3 Commit from bwang (2006-07-07 06:26 EDT) ----------------- Relocated the dynamic interceptors - JBossCache src-50/org/jboss/cache/pojo/collection/AbstractCollectionInterceptor.java 1.5 JBossCache src-50/org/jboss/cache/pojo/collection/CachedListImpl.java 1.4 - JBossCache src-50/org/jboss/cache/pojo/collection/CachedListInterceptor.java 1.5 JBossCache src-50/org/jboss/cache/pojo/collection/CachedMapImpl.java 1.7 - JBossCache src-50/org/jboss/cache/pojo/collection/CachedMapInterceptor.java 1.5 JBossCache src-50/org/jboss/cache/pojo/collection/CachedSetImpl.java 1.4 - JBossCache src-50/org/jboss/cache/pojo/collection/CachedSetInterceptor.java 1.5 JBossCache src-50/org/jboss/cache/pojo/collection/CollectionInterceptorUtil.java 1.4 + JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/AbstractCollectionInterceptor.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/BaseInterceptor.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/CacheInterceptor.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/CachedListInterceptor.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/CachedMapInterceptor.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/CachedSetInterceptor.java 1.1 JBossCache src-50/org/jboss/cache/pojo/util/AopUtil.java 1.3 - JBossCache src-50/org/jboss/cache/pojo/BaseInterceptor.java 1.5 - JBossCache src-50/org/jboss/cache/pojo/CacheInterceptor.java 1.5 JBossCache src-50/org/jboss/cache/pojo/CachedType.java 1.3 JBossCache src-50/org/jboss/cache/pojo/CollectionClassHandler.java 1.6 JBossCache src-50/org/jboss/cache/pojo/ObjectGraphHandler.java 1.5 JBossCache src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java 1.7 JBossCache tests-50/functional/org/jboss/cache/pojo/util/MethodCallTest.java 1.2 JBossCache tests-50/functional/org/jboss/cache/pojo/TxUndoTest.java 1.2 Commit from bwang (2006-07-07 06:36 EDT) ----------------- Renamed CacheInterceptor to CacheFieldInterceptor + JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java 1.1 - JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/CacheInterceptor.java 1.2 JBossCache src-50/org/jboss/cache/pojo/util/AopUtil.java 1.4 JBossCache src-50/org/jboss/cache/pojo/AOPInstance.java 1.3 JBossCache src-50/org/jboss/cache/pojo/ObjectGraphHandler.java 1.6 JBossCache src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java 1.8 JBossCache tests-50/functional/org/jboss/cache/pojo/test/Link.java 1.3 JBossCache tests-50/functional/org/jboss/cache/pojo/test/NodeManager.java 1.3 JBossCache tests-50/functional/org/jboss/cache/pojo/test/Person.java 1.3 JBossCache tests-50/functional/org/jboss/cache/pojo/test/Student.java 1.3 JBossCache tests-50/functional/org/jboss/cache/pojo/util/MethodCallTest.java 1.3 JBossCache tests-50/functional/org/jboss/cache/pojo/TxUndoTest.java 1.3 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-07 07:10 EDT) ------------------------------------------------------ Better fix for JBCACHE-668 and JBCACHE-682 JBossCache src/org/jboss/cache/interceptors/TxInterceptor.java 1.48.2.3 Commit from msurtani on branch Branch_JBossCache_1_3_0 (2006-07-07 07:11 EDT) ------------------------------------------------------ Fixed JBCACHE-668 and JBCACHE-682 JBossCache src/org/jboss/cache/interceptors/TxInterceptor.java 1.35.2.5 Commit from bdaw (2006-07-07 08:23 EDT) ---------------- - added parsing of "security-constraint" for portlet.xml - hopefully didn't break anything :) - some additional testing for this jboss-portal portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java 1.8 + jboss-portal portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityConstraintMetaData.java 1.1 jboss-portal portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java 1.9 jboss-portal portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 1.2 jboss-portal portlet/src/resources/test/deployment/portlet.xml 1.5 jboss-portal portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml 1.5 jboss-portal portlet/build.xml 1.124 Commit from mandersen (2006-07-07 09:03 EDT) --------------------- HBX-697 NPE when attempting to view entity with null valued, joined properties jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/HibernatePropertySourceProvider.java 1.8 Commit from wolfc (2006-07-07 09:08 EDT) ----------------- EJBTHREE-606: embedded life cycle methods working + jboss-ejb3 src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoBean.java 1.1 + jboss-ejb3 src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoLocal.java 1.1 jboss-ejb3 src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneLocal.java 1.2 jboss-ejb3 src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceOneBean.java 1.2 + jboss-ejb3 src/test/org/jboss/ejb3/test/standalone/servicepojo/ServiceTwoManagement.java 1.1 jboss-ejb3 src/main/org/jboss/ejb3/MCKernelAbstraction.java 1.5 jboss-ejb3 src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java 1.2 Commit from mandersen (2006-07-07 09:29 EDT) --------------------- stupid typo jbosside hibernatetools/plugins/org.hibernate.eclipse.console/doc/newandnoteworthy/hibernate-eclipse-news-3.2.0.beta6.html 1.3 Commit from kkhan (2006-07-07 09:50 EDT) ----------------- [JBAOP-272] Get rid of JoinPointInfo.factories/factoryChain and use interceptors/interceptorChain for generated advisors as well. InterceptorFactoryWrapper has been renamed to GeneratedAdvisorInterceptor and its invoke() method generates/obtains real interceptor and delegates onto it if we are invoking dynamically. aop-mc-int src/main/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java 1.4 jboss-aop src/main/org/jboss/aop/JoinPointInfo.java 1.4 jboss-aop src/main/org/jboss/aop/ClassAdvisor.java 1.155 jboss-aop src/main/org/jboss/aop/GeneratedInstanceAdvisorMixin.java 1.7 jboss-aop src/main/org/jboss/aop/Advisor.java 1.94 jboss-aop src/main/org/jboss/aop/GeneratedClassAdvisor.java 1.36 jboss-aop src/main/org/jboss/aop/instrument/JoinPointGenerator.java 1.29 jboss-aop src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java 1.35 - jboss-aop src/main/org/jboss/aop/advice/InterceptorFactoryWrapper.java 1.9 + jboss-aop src/main/org/jboss/aop/advice/GeneratedAdvisorInterceptor.java 1.1 jboss-aop src/main/org/jboss/aop/advice/PrecedenceSorter.java 1.9 Commit from mandersen (2006-07-07 09:50 EDT) --------------------- JBIDE-276 - lgpl headers jbosside hibernatetools/plugins/org.hibernate.eclipse.help/src/java/org/hibernate/eclipse/help/HelpPlugin.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/HibernateConfigurationForm.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngSectionPart.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngDetailsPage.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/IFormTextEntryListener.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesContentProvider.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/FormTextEntryListenerAdapter.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ColumnDetailsPage.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/GeneratorDetailsPage.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ParamDetailsPage.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngOverviewPage.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/PrimaryKeyDetailsPage.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingFormPart.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngFormEditorPart.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTypeMappingPage.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableFilterFormPart.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTablesPage.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TypeMappingView.java 1.10 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/CounterFormPart.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesLabelProvider.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableDetailsPage.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/ConsoleConfigNamePart.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/RevEngTableFilterPage.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMAdapter.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/RevEngGeneratorAdapter.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/RevEngColumnAdapter.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/RevEngParamAdapter.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/TypeMappingAdapter.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/TableFilterAdapter.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/RevEngPrimaryKeyAdapter.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMModelUtil.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/DOMReverseEngineeringDefinition.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/model/RevEngTableAdapter.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/HibernateXMLContentOutlineConfiguration.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/JFaceNodeAdapterForXML.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/views/contentoutline/JFaceNodeAdapterFactoryForXML.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/SQLTypeContentProvider.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HibernateContentAssistProcessor.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLStructuredTextViewerConfiguration.java 1.12 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/CFGXMLContentAssistProcessor.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HibernateCfgXmlEditor.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLHyperlink.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditorContributor.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/CFGXMLStructuredTextViewerConfiguration.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLHyperlinkDetector.java 1.10 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeringEditor.java 1.17 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLContentAssistProcessor.java 1.11 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/PersistenceUnitStructuredTextViewerConfiguration.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/GeneratorTypeHandler.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HibernateTypeDescriptor.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/PropertyAccessHandler.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/FieldPropertyHandler.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/JavaTypeHandler.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandler.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java 1.17 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoHandler.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HibernateTypeHandler.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/PackageHandler.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHandler.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/modelhandler/ModelHandlerForREVENGXML.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/modelhandler/ModelHandlerForCFGXML.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/modelhandler/ModelHandlerForPersistenceUnitXML.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/modelhandler/ModelHandlerForHBMXML.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/registry/AdapterFactoryProviderForREVENGXML.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/registry/AdapterFactoryProviderForXML.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/registry/AdapterFactoryProviderForCFGXML.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/registry/AdapterFactoryProviderForHBMXML.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/MapperPlugin.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/factory/UnknownNodeAdapter.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/factory/ObserverAdapterFactory.java 1.6 + jbosside hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/BeanShellIntegrationTest.java 1.1 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/execution/DefaultExecutionContext.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/execution/ExecutionContextHolder.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/execution/ExecutionContext.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ConfigurationListNode.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/IdentifierNode.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ClassNode.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ConfigurationNode.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/NodeFactory.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/PersistentCollectionNode.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ConfigurationEntitiesNode.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/BaseNode.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/TableNode.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ProxyFactory.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/PropertyNode.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/TypeNode.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/eclipse/logging/PluginLogAppender.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/eclipse/logging/PluginLogManager.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/eclipse/logging/PluginLogListener.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/eclipse/logging/PluginFileAppender.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/eclipse/logging/PluginLogger.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/eclipse/logging/LoggingHelper.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfigurationListener.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/QueryPage.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/QueryInputModel.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/SwingImageMap.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageMap.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 1.10 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HibernateConsoleRuntimeException.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/AbstractQueryPage.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurationsListener.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/QueryPageModel.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/SwingImages.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleQueryParameter.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/JavaPage.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ImageConstants.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeDelegatingDriver.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/StandAloneConsoleConfigurationPreferences.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/AbstractConsoleConfigurationPreferences.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/preferences/ConsoleConfigurationPreferences.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/eclipse/HibernatePlugin.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/src/org/hibernate/eclipse/jdt/apt/ui/Activator.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/src/org/hibernate/eclipse/jdt/apt/ui/HQLAnnotationProcessor.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/src/org/hibernate/eclipse/jdt/apt/ui/HQLAnnotationProcessorFactory.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettings.java 1.10 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/OpenHibernateToolsConfigurations.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 1.14 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettings.java 1.9 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/GeneralExceptionStatusHandler.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/HibernateLaunchConstants.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/LaunchMenuDelegate.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/LaunchConfigurationTabGroup.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLColors.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditorInput.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLSourceViewer.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionHelper.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLLexerRule.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLPartitionScanner.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLSourceViewerConfiguration.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditorDocumentSetupParticipant.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditorInputFactory.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/DisplayStringProposalComparator.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditorStorage.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/EclipseHQLCompletionRequestor.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HibernateResultCollector.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/CompletionProposal.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLTextHover.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLFormattingStrategy.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCodeScanner.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditorActionContributor.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java 1.10 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLWordDetector.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/MinimalDiffContextInformationValidator.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/CollectionPropertySource.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/HibernatePropertySourceProvider.java 1.9 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/EntityPropertySource.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/QueryPagePropertySource.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/HibernateConfigurationPartFactory.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/EntityGraphView.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalConfigurationEditPart.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/ColumnEditPart.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/GraphViewActionGroup.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalConfigurationEditPartFactory.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/AbstractGraphViewPart.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/layout/NodeJoiningDirectedGraphLayout.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/layout/DummyEdgePart.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/layout/GraphLayoutManager.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/layout/GraphAnimation.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/layout/ClusterEdgeCreator.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/layout/DirectedGraphLayoutVisitor.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/layout/DummyEdgeCreator.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/layout/DelegatingLayoutManager.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/layout/GraphXYLayout.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CloseQueryPageAction.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/EditorActionDelegate.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/RefreshAction.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/EditConsoleConfiguration.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/JTidyFormatAction.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ClearAction.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/HQLScratchpadAction.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/BuildSessionFactoryAction.java 1.10 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ConsoleConfigurationBasedAction.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteHQLAction.java 1.12 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ClearHQLEditorAction.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CriteriaEditorAction.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConsoleConfigurationPropertySourceProvider.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/IQueryParametersPage.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsProvider.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java 1.11 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java 1.16 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/TreeNodeContentProvider.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryPageTabViewActionGroup.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/NavigatorProvider.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryPageTabView.java 1.11 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsContentProvider.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersView.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/DynamicSQLPreviewView.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryPageViewer.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/SchemaExportAction.java 1.10 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConsoleConfigurationPropertySource.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/AbstractReconcilingStrategy.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationCreationWizard.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/CollectingSearchRequestor.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TreeToTableComposite.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java 1.12 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterWizardPage.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterCellModifier.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TypeMappingContentProvider.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewHibernateMappingFileWizard.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewReverseEngineeringFileWizard.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java 1.21 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizardPage.java 1.8 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterContentProvider.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewHibernateMappingFilePage.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TypeMappingLabelProvider.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterView.java 1.11 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/UpDownListComposite.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TypeMappingCellModifier.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterLabelProvider.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BeanPropertyDescriptor.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazySessionFactory.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ColumnWorkbenchAdapter.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazySessionFactoryAdapter.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java 1.9 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/HibernateWorkbenchHelper.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationWorkbenchAdapter.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PrimaryKeyWorkbenchAdapter.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValueVisitor.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValueVisitor.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ValueWorkbenchAdapter.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/DeferredContentProvider.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/KnownConfigurationsWorkbenchAdapter.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchema.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BaseNodeWorkbenchAdapter.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PersistentClassWorkbenchAdapter.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableModelList.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ProgressListenerMonitor.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BasicWorkbenchAdapter.java 1.9 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java 1.10 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/GenericPropertySource.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/ConfigurationViewAdapter.java 1.7 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapter.java 1.9 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyAssociationViewAdapter.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PersistentClassViewAdapter.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/ColumnViewAdapter.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/AssociationViewAdapter.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/InheritanceViewAdapter.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/GraphNode.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditorStorage.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaViewerConfiguration.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditorDocumentSetupParticipant.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditorActionContributor.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditorInput.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditorInputFactory.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaditorInputFactory.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ExtensionManager.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfiguration.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ConsolePreferencesConstants.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java 1.6 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 1.26 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/QueryEditor.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePerspectiveFactory.java 1.15 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/FileFilter.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleSaveParticipant.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/Messages.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/command/MoveEditPartCommand.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/command/MoveGraphNodeEditPartCommand.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/policy/PropertySelectionPolicy.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/policy/PersistentClassLayoutPolicy.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/policy/ConfigurationLayoutEditPolicy.java 1.5 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/ITypeMapping.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/IRevEngPrimaryKey.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/Notifiable.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/IRevEngGenerator.java 1.3 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/ITableFilter.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/IRevEngColumn.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/IRevEngTable.java 1.4 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/IRevEngParameter.java 1.2 jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate... [truncated message content] |
|
From: Ben W. <bw...@jb...> - 2006-07-08 03:36:59
|
User: bwang Date: 06/07/07 23:36:58 Log: Directory /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/event added to the repository |
|
From: Ben W. <bw...@jb...> - 2006-07-08 03:29:15
|
User: bwang Date: 06/07/07 23:29:14 Log: Directory /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/observable added to the repository |
|
From: Gurkan E. <gur...@ya...> - 2006-07-08 02:29:36
|
User: gurkanerdogdu
Date: 06/07/07 22:29:34
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards
RemoteConfigurationWizard.java
Log:
Revision Changes Path
1.3 +1 -0 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/RemoteConfigurationWizard.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RemoteConfigurationWizard.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/RemoteConfigurationWizard.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RemoteConfigurationWizard.java 6 Jul 2006 19:48:56 -0000 1.2
+++ RemoteConfigurationWizard.java 8 Jul 2006 02:29:34 -0000 1.3
@@ -65,6 +65,7 @@
rootInstance.setRemoteCache(true);
rootInstance.setIsDirty(true);
rootInstance.setRemoteCacheConfigParams(remoteConfigParams);
+ rootInstance.setCacheServiceName(remoteConfigPage.getTxtCacheServiceName().getText().trim());
CacheInstanceFactory.getCacheRootMainInstance().addRootInstanceChild(rootInstance);
if(workbench == null)
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-08 02:29:36
|
User: gurkanerdogdu
Date: 06/07/07 22:29:34
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache
CachePropertyPage.java
Log:
Revision Changes Path
1.3 +14 -0 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/CachePropertyPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CachePropertyPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/CachePropertyPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CachePropertyPage.java 23 Mar 2006 11:12:31 -0000 1.2
+++ CachePropertyPage.java 8 Jul 2006 02:29:34 -0000 1.3
@@ -55,6 +55,7 @@
private CacheConfigParams defaultConfigParams = new CacheConfigParams();
private RemoteCacheConfigParams remoteParams = null;
private RemoteCacheConfigParams defaultRemoteParams = new RemoteCacheConfigParams();
+ private String defaultCacheServiceName;
private Label lblDefaultUrl;
private Text txtDefaultUrl;
@@ -62,6 +63,8 @@
private Text txtDefaultPort;
private Label lblDefaultJndi;
private Text txtDefaultJndi;
+ private Label lblCacheServiceName;
+ private Text txtCacheServiceName;
public CachePropertyPage()
{
@@ -77,6 +80,7 @@
else{
remoteParams = rootInstance.getRemoteCacheConfigParams();
+ defaultCacheServiceName = rootInstance.getCacheServiceName();
defaultRemoteParams.setJarList(new ArrayList(remoteParams.getJarList()));
defaultRemoteParams.setJndi(remoteParams.getJndi());
defaultRemoteParams.setPort(remoteParams.getPort());
@@ -222,6 +226,13 @@
txtDefaultJndi.setText(remoteParams.getJndi());
txtDefaultJndi.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ lblCacheServiceName = new Label(container,SWT.NONE);
+ lblCacheServiceName.setText("Cache Service Name");
+ txtCacheServiceName = new Text(container,SWT.BORDER);
+ txtCacheServiceName.setText(defaultCacheServiceName);
+ txtCacheServiceName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+
addJarViewer(container);
return container;
@@ -312,6 +323,7 @@
remoteParams.setJndi(txtDefaultJndi.getText().trim());
remoteParams.setPort(txtDefaultPort.getText().trim());
remoteParams.setUrl(txtDefaultUrl.getText().trim());
+ rootInstance.setCacheServiceName(txtCacheServiceName.getText().trim());
rootInstance.setIsDirty(true);
}
@@ -329,11 +341,13 @@
remoteParams.setJndi(defaultRemoteParams.getJndi());
remoteParams.setPort(defaultRemoteParams.getPort());
remoteParams.setUrl(defaultRemoteParams.getUrl());
+ rootInstance.setCacheServiceName(defaultCacheServiceName);
rootInstance.setIsDirty(false);
txtDefaultJndi.setText(remoteParams.getJndi());
txtDefaultPort.setText(remoteParams.getPort());
txtDefaultUrl.setText(remoteParams.getUrl());
+ txtCacheServiceName.setText(defaultCacheServiceName);
jarTableViewer.setInput(remoteParams.getJarList());
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-08 02:29:36
|
User: gurkanerdogdu
Date: 06/07/07 22:29:34
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal
RemoteCacheManager.java
Log:
Revision Changes Path
1.4 +3 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/RemoteCacheManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RemoteCacheManager.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/RemoteCacheManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- RemoteCacheManager.java 8 Jul 2006 01:59:06 -0000 1.3
+++ RemoteCacheManager.java 8 Jul 2006 02:29:34 -0000 1.4
@@ -227,12 +227,14 @@
try{
if(con == null)
con = (MBeanServerConnection)ctx.lookup("jmx/invoker/RMIAdaptor");
+
String [] names = ICacheConstants.STAT_INTERCEPTOR_NAMES;
+ String serviceName = rootInstance.getCacheServiceName();
for(int i=0;i<names.length;i++){
String tmp = names[i];
try{
- ObjectInstance instance = con.getObjectInstance(new ObjectName("jboss.cache:service=TreeCache,treecache-interceptor="+tmp));
+ ObjectInstance instance = con.getObjectInstance(new ObjectName(serviceName+",treecache-interceptor="+tmp));
map.put(instance.getClassName().substring(29),con.invoke(instance.getObjectName(),"dumpStatistics", new Object[]{},new String[]{}));
}catch(Exception e){
continue;
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-08 02:29:36
|
User: gurkanerdogdu
Date: 06/07/07 22:29:34
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages
RemoteConfigurationPage.java
Log:
Revision Changes Path
1.3 +43 -3 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/RemoteConfigurationPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RemoteConfigurationPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/RemoteConfigurationPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RemoteConfigurationPage.java 6 Jul 2006 19:48:56 -0000 1.2
+++ RemoteConfigurationPage.java 8 Jul 2006 02:29:34 -0000 1.3
@@ -41,6 +41,7 @@
private static final String DEFAULT_URL = "localhost";
private static final String DEFAULT_PORT = "1099";
private static final String DEFAULT_JNDI_NAME = "jndi_name";
+ private static final String [] DEFAULT_CACHE_SERVICE_NAME = {"jboss.cache:service=TreeCache","jboss.cache:service=TreeCacheAop"};
private Label lblDefaultConfigName;
private Text txtDefaultConfigName;
@@ -53,6 +54,9 @@
private Label lblCacheType;
private Combo cmbCacheType;
+ private Label lblCacheServiceName;
+ private Text txtCacheServiceName;
+
private TableViewer jarTableViewer;
private Group grpAddJars;
private Button btnAddJar;
@@ -87,6 +91,12 @@
cmbCacheType.setItems(ICacheConstants.CACHE_TYPE_MODE);
cmbCacheType.select(0);
cmbCacheType.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ cmbCacheType.addSelectionListener(new SelectionAdapter(){
+
+ public void widgetSelected(SelectionEvent e){
+ handleCacheTypeSelected(e);
+ }
+ });
lblDefaultConfigName = new Label(container,SWT.NONE);
@@ -117,6 +127,14 @@
txtDefaultJndi.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
txtDefaultJndi.addModifyListener(this);
+ lblCacheServiceName = new Label(container,SWT.NONE);
+ lblCacheServiceName.setText("Cache Service Name");
+ txtCacheServiceName = new Text(container,SWT.BORDER);
+ txtCacheServiceName.setText(DEFAULT_CACHE_SERVICE_NAME[0]);
+ txtCacheServiceName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ txtCacheServiceName.addModifyListener(this);
+
+
grpAddJars = new Group(container, SWT.SHADOW_ETCHED_IN);
grpAddJars.setLayout(new GridLayout(3, true));
grpAddJars.setText(CacheUtil
@@ -169,7 +187,15 @@
}
- /**
+ protected void handleCacheTypeSelected(SelectionEvent e) {
+ cmbCacheType = (Combo)e.widget;
+ if(cmbCacheType.getText().equals(ICacheConstants.CACHE_TYPE_MODE[0])){
+ txtCacheServiceName.setText(DEFAULT_CACHE_SERVICE_NAME[0]);
+ }else
+ txtCacheServiceName.setText(DEFAULT_CACHE_SERVICE_NAME[1]);
+ }
+
+/**
* Jar selection
*/
private void handleAddJarSelected()
@@ -251,6 +277,15 @@
updatePage(null);
}
+ }else if(widget == txtCacheServiceName){
+ if(txtCacheServiceName.getText().equals(""))
+ {
+ updatePage("Please give the cache service name");
+ }
+ else{
+ updatePage(null);
+ }
+
}
}
@@ -266,7 +301,8 @@
if(!txtDefaultConfigName.getText().equals("") &&
!txtDefaultJndi.getText().equals("") &&
!txtDefaultPort.getText().equals("") &&
- !txtDefaultUrl.getText().equals(""))
+ !txtDefaultUrl.getText().equals("") &&
+ !txtCacheServiceName.getText().equals(""))
{
setPageComplete(true);
}
@@ -313,6 +349,10 @@
return jarList;
}
+public Text getTxtCacheServiceName() {
+ return txtCacheServiceName;
+}
+
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-08 02:29:36
|
User: gurkanerdogdu
Date: 06/07/07 22:29:34
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache
ICacheRootInstance.java
AbstractCacheRootInstance.java
Log:
Revision Changes Path
1.3 +3 -0 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache/ICacheRootInstance.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ICacheRootInstance.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache/ICacheRootInstance.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ICacheRootInstance.java 23 Mar 2006 11:12:32 -0000 1.2
+++ ICacheRootInstance.java 8 Jul 2006 02:29:34 -0000 1.3
@@ -203,4 +203,7 @@
void setRemoteCache(boolean isRemote);
+ void setCacheServiceName(String serviceName);
+ String getCacheServiceName();
+
}//end of interface
1.4 +13 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache/AbstractCacheRootInstance.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractCacheRootInstance.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache/AbstractCacheRootInstance.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AbstractCacheRootInstance.java 6 Jul 2006 19:48:57 -0000 1.3
+++ AbstractCacheRootInstance.java 8 Jul 2006 02:29:34 -0000 1.4
@@ -55,11 +55,23 @@
protected boolean isDirty = false;
- /**Cache type is TreeCache or TreeCacheAOP*/
+ protected String cacheServiceName;
+
+ public String getCacheServiceName() {
+ return this.cacheServiceName;
+ }
+
+ public void setCacheServiceName(String serviceName) {
+ this.cacheServiceName = serviceName;
+
+ }
+
+/**Cache type is TreeCache or TreeCacheAOP*/
private String cacheType = ICacheConstants.JBOSS_CACHE_TREE_CACHE;//Default as TreeCache
private String rootLabel;
+
/**TreeCache instance with this root instance configuration*///local cache
protected TreeCacheManager treeCacheManager;
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-08 01:59:09
|
User: gurkanerdogdu
Date: 06/07/07 21:59:06
Added: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions
ShowStatisticsAction.java
Log:
Cache Statistic View added
Revision Changes Path
1.1 date: 2006/07/08 01:59:06; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/ShowStatisticsAction.java
Index: ShowStatisticsAction.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.actions;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.ui.PartInitException;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin;
import org.jboss.ide.eclipse.jbosscache.views.config.TreeCacheView;
import org.jboss.ide.eclipse.jbosscache.views.statistic.CacheStatView;
public class ShowStatisticsAction extends AbstractCacheAction {
/**
* Constructor
*
* @param view
* @param id
*/
public ShowStatisticsAction(TreeCacheView view, String id) {
super(view, id);
}
public void run() {
try {
// Show the content view if not showing
CacheStatView part = (CacheStatView) getTreeViewer().getViewSite()
.getPage()
.showView(ICacheConstants.CACHE_STATISTIC_VIEW_ID);
part.showStatContent(getTreeViewer().getSelection());
} catch (PartInitException e) {
IStatus status = new Status(IStatus.ERROR,
ICacheConstants.CACHE_PLUGIN_UNIQUE_ID, IStatus.ERROR, e
.getMessage(), e);
JBossCachePlugin.getDefault().getLog().log(status);
}
}
}
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-08 01:59:08
|
User: gurkanerdogdu
Date: 06/07/07 21:59:06
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils
CacheUtil.java
Log:
Cache Statistic View added
Revision Changes Path
1.6 +10 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheUtil.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CacheUtil.java 6 Jul 2006 19:48:57 -0000 1.5
+++ CacheUtil.java 8 Jul 2006 01:59:06 -0000 1.6
@@ -115,7 +115,7 @@
childServerMemonto = memonto.createChild(ICacheConstants.MBEAN);
- if(cacheConfigModel.getCacheMode().equals(ICacheConstants.JBOSS_CACHE_TREE_CACHE))
+ if(cacheConfigModel.getCacheType().equals(ICacheConstants.JBOSS_CACHE_TREE_CACHE))
{
childServerMemonto.putString(ICacheConstants.CODE, "org.jboss.cache.TreeCache");
childServerMemonto.putString(ICacheConstants.NAME, "jboss.cache:service=TreeCache");
@@ -742,6 +742,15 @@
}
+ public static boolean isNameInStatInterceptor(String name){
+ for(int i=0;i<ICacheConstants.STAT_INTERCEPTOR_NAMES.length;i++){
+ if(name.equals(ICacheConstants.STAT_INTERCEPTOR_NAMES[i]))
+ return true;
+ }
+
+ return false;
+ }
+
}//end of class
\ No newline at end of file
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-08 01:59:08
|
User: gurkanerdogdu
Date: 06/07/07 21:59:06
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal
RemoteCacheManager.java
Log:
Cache Statistic View added
Revision Changes Path
1.3 +51 -2 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/RemoteCacheManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RemoteCacheManager.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/RemoteCacheManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RemoteCacheManager.java 6 Jul 2006 19:48:56 -0000 1.2
+++ RemoteCacheManager.java 8 Jul 2006 01:59:06 -0000 1.3
@@ -6,30 +6,40 @@
*/
package org.jboss.ide.eclipse.jbosscache.model.internal;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectInstance;
+import javax.management.ObjectName;
import javax.naming.InitialContext;
import org.jboss.cache.Fqn;
+import org.jboss.cache.TreeCache;
import org.jboss.cache.TreeCacheMBean;
import org.jboss.cache.aop.TreeCacheAopMBean;
+import org.jboss.cache.interceptors.Interceptor;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheInstance;
import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheRootInstance;
import org.jboss.ide.eclipse.jbosscache.model.config.RemoteCacheConfigParams;
import org.jboss.ide.eclipse.jbosscache.model.factory.CacheInstanceFactory;
+import org.jboss.ide.eclipse.jbosscache.utils.CacheUtil;
public class RemoteCacheManager
{
- private InitialContext ctx;
+ private static InitialContext ctx;
private ICacheRootInstance rootInstance;
private RemoteCacheConfigParams params;
private TreeCacheMBean treeCacheMBean;
private TreeCacheAopMBean treeCacheAopMBean;
private boolean isAop = false;
private ClassLoader managerLoader;
+ private static MBeanServerConnection con;
public RemoteCacheManager(ICacheRootInstance rootInstance){
this.rootInstance = rootInstance;
@@ -48,7 +58,9 @@
prop.put("java.naming.provider.url","jnp://"+params.getUrl()+":"+params.getPort());
prop.put("java.naming.factory.url.pkgs","org.jboss.naming:org.jnp.interfaces");
+ if(ctx == null)
ctx = new InitialContext(prop);
+
connectToRemoteCache();
}catch(Exception e){
@@ -201,4 +213,41 @@
this.managerLoader = managerLoader;
}
+ public boolean isUseMbeanAttributes(){
+ TreeCacheMBean mbean = getTreeCacheMBean();
+
+ return mbean.getUseInterceptorMbeans();
+ }
+
+
+ public Map getStatisticsAttribute(){
+
+ Map map = new HashMap();
+
+ try{
+ if(con == null)
+ con = (MBeanServerConnection)ctx.lookup("jmx/invoker/RMIAdaptor");
+ String [] names = ICacheConstants.STAT_INTERCEPTOR_NAMES;
+
+ for(int i=0;i<names.length;i++){
+ String tmp = names[i];
+ try{
+ ObjectInstance instance = con.getObjectInstance(new ObjectName("jboss.cache:service=TreeCache,treecache-interceptor="+tmp));
+ map.put(instance.getClassName().substring(29),con.invoke(instance.getObjectName(),"dumpStatistics", new Object[]{},new String[]{}));
+ }catch(Exception e){
+ continue;
+ }
+ }
+ }catch(Exception e){
+
+ }
+
+ return map;
+
+ }
+
+ public static void main(String[] args) {
+ System.out.println("org.jboss.cache.interceptors.CacheLoaderInterceptor".substring(29));
+}
+
}
\ No newline at end of file
|
185 messages has been excluded from this view by a project administrator.
