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: Mark P. <mar...@jb...> - 2006-07-10 02:42:41
|
User: mproctor Date: 06/07/09 22:42:39 Log: Directory /cvsroot/jboss/repository.jboss.com/maven2/org/drools/drools-jsr94/3.0.2 added to the repository |
|
From: Mark P. <mar...@jb...> - 2006-07-10 02:42:41
|
User: mproctor Date: 06/07/09 22:42:39 Log: Directory /cvsroot/jboss/repository.jboss.com/maven2/org/drools/drools-decisiontables/3.0.2 added to the repository |
|
From: Mark P. <mar...@jb...> - 2006-07-10 02:42:41
|
User: mproctor Date: 06/07/09 22:42:39 Log: Directory /cvsroot/jboss/repository.jboss.com/maven2/org/drools/drools-compiler/3.0.2 added to the repository |
|
From: Ben W. <bw...@jb...> - 2006-07-10 02:31:31
|
User: bwang
Date: 06/07/09 22:31:30
Modified: src/resources jboss-aop.xml
Log:
Added back the 1.4 style PojoCacheable.
Revision Changes Path
1.10 +11 -0 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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- jboss-aop.xml 8 Jul 2006 17:41:28 -0000 1.9
+++ jboss-aop.xml 10 Jul 2006 02:31:29 -0000 1.10
@@ -51,6 +51,17 @@
-->
<!-- If a POJO has PojoCachable annotation, it will be asepctized. -->
+ <prepare expr="field(* @org.jboss.cache.aop.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}->*)" />
+
+
+ <!-- PojoCache 2.0 style -->
+ <!-- If a POJO has PojoCachable annotation, it will be asepctized. -->
<prepare expr="field(* @org.jboss.cache.pojo.annotation.PojoCacheable->*)" />
<!--
|
|
From: Ben W. <bw...@jb...> - 2006-07-10 02:30:33
|
User: bwang
Date: 06/07/09 22:30:31
Modified: src-50/org/jboss/cache/pojo/observable
SubjectInterceptor.java
Log:
Make sure CacheFieldInterceptor and SubjectInterceptor to skip MethodInvolcation.
Revision Changes Path
1.2 +6 -1 JBossCache/src-50/org/jboss/cache/pojo/observable/SubjectInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SubjectInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/observable/SubjectInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SubjectInterceptor.java 8 Jul 2006 17:41:16 -0000 1.1
+++ SubjectInterceptor.java 10 Jul 2006 02:30:31 -0000 1.2
@@ -24,13 +24,14 @@
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.FieldInvocation;
import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aop.joinpoint.MethodInvocation;
/**
* A Subject Interceptor. Traps changes to the object
* and fires change notifications.
*
* @author Ben Wang
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class SubjectInterceptor implements Interceptor
{
@@ -43,6 +44,10 @@
public Object invoke(Invocation invocation) throws Throwable
{
+ // Kind of ad hoc now. MethodInvocation should not invoke this.
+ if(invocation instanceof MethodInvocation)
+ return invocation.invokeNext();
+
FieldInvocation fi = (FieldInvocation) invocation;
Subject observable = (Subject) fi.getTargetObject();
|
|
From: Ben W. <bw...@jb...> - 2006-07-10 02:30:33
|
User: bwang
Date: 06/07/09 22:30:31
Modified: src-50/org/jboss/cache/pojo PojoUtil.java
Log:
Make sure CacheFieldInterceptor and SubjectInterceptor to skip MethodInvolcation.
Revision Changes Path
1.6 +48 -19 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PojoUtil.java 10 Jul 2006 00:48:54 -0000 1.5
+++ PojoUtil.java 10 Jul 2006 02:30:31 -0000 1.6
@@ -13,6 +13,7 @@
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.observable.SubjectInterceptor;
import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor;
import java.lang.reflect.Field;
@@ -20,7 +21,7 @@
/**
* Utility class for method wrappers that we are interested to rollback (i.e., undo).
* @author Ben Wang
- * @version $Id: PojoUtil.java,v 1.5 2006/07/10 00:48:54 bwang Exp $
+ * @version $Id: PojoUtil.java,v 1.6 2006/07/10 02:30:31 bwang Exp $
*/
public class PojoUtil
{
@@ -28,43 +29,30 @@
public void attachInterceptor(Object pojo, InstanceAdvisor advisor, Interceptor interceptor,
Observer observer)
{
- // add the observer
- ((Subject)pojo).addObserver(observer);
-
- advisor.appendInterceptor(interceptor);
+ _attachInterceptor(pojo, advisor, interceptor, observer);
}
@TxUndo
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);
+ _detachInterceptor(advisor, interceptor, observer);
}
public void undoAttachInterceptor(Object pojo, InstanceAdvisor advisor, Interceptor interceptor,
Observer observer)
{
- advisor.removeInterceptor(interceptor.getName());
- ((Subject)pojo).removeObserver(observer);
+ _detachInterceptor(advisor, interceptor, observer);
}
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);
+
+ _attachInterceptor(pojo, advisor, interceptor, observer);
}
@@ -85,4 +73,45 @@
}
}
+ private void _attachInterceptor(Object pojo, InstanceAdvisor advisor, Interceptor interceptor,
+ Observer observer)
+ {
+ // add the observer
+ ((Subject)pojo).addObserver(observer);
+
+ // Note that subject interceptor should come before the cache interceptor.
+// SubjectInterceptor si = new SubjectInterceptor();
+// advisor.appendInterceptor(si);
+ advisor.appendInterceptor(interceptor);
+ }
+
+ private void _detachInterceptor(InstanceAdvisor advisor, Interceptor interceptor, Observer observer)
+ {
+ advisor.removeInterceptor(interceptor.getName());
+// removeSubjectInterceptor(advisor);
+ // retrieve pojo
+ Object pojo = ((CacheFieldInterceptor)interceptor).getAopInstance().get();
+
+ if(pojo == null)
+ {
+ throw new PojoCacheException("PojoUtil.detachInterceptor(): null pojo");
+ }
+
+ ((Subject)pojo).removeObserver(observer);
+ }
+
+ private void removeSubjectInterceptor(InstanceAdvisor advisor)
+ {
+ Interceptor[] interceptors = advisor.getInterceptors();
+ // Step Check for cross references
+ for (int i = 0; i < interceptors.length; i++)
+ {
+ Interceptor interceptor = interceptors[i];
+ if (interceptor instanceof SubjectInterceptor)
+ {
+ advisor.removeInterceptor(interceptor.getName());
+ return; // assume there is only one.
+ }
+ }
+ }
}
|
|
From: Ben W. <bw...@jb...> - 2006-07-10 02:30:33
|
User: bwang
Date: 06/07/09 22:30:31
Modified: src-50/org/jboss/cache/pojo/interceptors/dynamic
CacheFieldInterceptor.java
Log:
Make sure CacheFieldInterceptor and SubjectInterceptor to skip MethodInvolcation.
Revision Changes Path
1.2 +5 -0 JBossCache/src-50/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheFieldInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheFieldInterceptor.java 7 Jul 2006 10:36:22 -0000 1.1
+++ CacheFieldInterceptor.java 10 Jul 2006 02:30:31 -0000 1.2
@@ -16,6 +16,7 @@
import org.jboss.aop.joinpoint.FieldReadInvocation;
import org.jboss.aop.joinpoint.FieldWriteInvocation;
import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.cache.Fqn;
import org.jboss.cache.pojo.memory.FieldPersistentReference;
import org.jboss.cache.pojo.util.AopUtil;
@@ -89,6 +90,10 @@
public Object invoke(Invocation invocation) throws Throwable
{
+ // Kind of ad hoc now. MethodInvocation should not invoke this.
+ if(invocation instanceof MethodInvocation)
+ return invocation.invokeNext();
+
// Check if CLASS_INTERNAL exists. If not, that means we are done. We need to remove ourself.
// Note that if speed is important, we will need to perform the detach step pro-actively,
// that is, use a listener to listen for the removeObject event.
|
|
From: Ben W. <bw...@jb...> - 2006-07-10 02:09:31
|
User: bwang
Date: 06/07/09 22:09:28
Modified: tests-50/functional/org/jboss/cache/pojo/util
MethodCallTest.java
Log:
upd
Revision Changes Path
1.4 +0 -20 JBossCache/tests-50/functional/org/jboss/cache/pojo/util/MethodCallTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MethodCallTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests-50/functional/org/jboss/cache/pojo/util/MethodCallTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MethodCallTest.java 7 Jul 2006 10:38:34 -0000 1.3
+++ MethodCallTest.java 10 Jul 2006 02:09:28 -0000 1.4
@@ -48,26 +48,6 @@
// public void testDummy() {}
- public void testUtil() throws Throwable
- {
- log_.info("testUtil() ....");
-
- InstanceAdvisor advisor = new ClassInstanceAdvisor();
- Interceptor interceptor = new CacheFieldInterceptor();
-
- Method method = MethodDeclarations.undoAttachInterceptor;
-
- Object[] args = new Object[] {advisor, interceptor};
- PojoUtil util = new PojoUtil();
- MethodCall mc = new MethodCall(method, args, util);
-
- mc.invoke();
-
- method = MethodDeclarations.undoDetachInterceptor;
- mc = new MethodCall(method, args, util);
- mc.invoke(util);
- }
-
public void testBasic() throws Throwable
{
Integer i = new Integer(1);
|
|
From: Ben W. <bw...@jb...> - 2006-07-10 00:48:57
|
User: bwang
Date: 06/07/09 20:48:54
Modified: src-50/org/jboss/cache/pojo PojoUtil.java
Log:
Needed to reverse the addObserver sequence.
Revision Changes Path
1.5 +3 -2 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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PojoUtil.java 8 Jul 2006 17:41:16 -0000 1.4
+++ PojoUtil.java 10 Jul 2006 00:48:54 -0000 1.5
@@ -20,7 +20,7 @@
/**
* Utility class for method wrappers that we are interested to rollback (i.e., undo).
* @author Ben Wang
- * @version $Id: PojoUtil.java,v 1.4 2006/07/08 17:41:16 bwang Exp $
+ * @version $Id: PojoUtil.java,v 1.5 2006/07/10 00:48:54 bwang Exp $
*/
public class PojoUtil
{
@@ -28,9 +28,10 @@
public void attachInterceptor(Object pojo, InstanceAdvisor advisor, Interceptor interceptor,
Observer observer)
{
- advisor.appendInterceptor(interceptor);
// add the observer
((Subject)pojo).addObserver(observer);
+
+ advisor.appendInterceptor(interceptor);
}
@TxUndo
|
|
From: Scott S. <sco...@jb...> - 2006-07-09 23:48:48
|
User: starksm Date: 06/07/09 19:48:46 Modified: src/resources/tests/xml deployer-beans.xml Log: Bootstrap the ProfileService implementation from the deployer-beans.xml and drop the unnecessary ServerPSBootstrap class. Revision Changes Path 1.2 +6 -0 system2/src/resources/tests/xml/deployer-beans.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: deployer-beans.xml =================================================================== RCS file: /cvsroot/jboss/system2/src/resources/tests/xml/deployer-beans.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- deployer-beans.xml 6 Jul 2006 06:51:20 -0000 1.1 +++ deployer-beans.xml 9 Jul 2006 23:48:46 -0000 1.2 @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- An example profile service based bootstrap mc descriptor --> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer"> + <bean name="ProfileService" class="org.jboss.system.server.profileservice.ProfileServiceImpl"> + <constructor> + <parameter>default</parameter> + </constructor> + </bean> <bean name="MainDeployer" class="org.jboss.deployers.plugins.MainDeployerImpl"> <!-- Should be VFSFactory, JBMICROCONT-95 --> <property name="vFSFactory"><inject bean="VFSFactory"/></property> |
|
From: Scott S. <sco...@jb...> - 2006-07-09 23:48:24
|
User: starksm
Date: 06/07/09 19:48:22
Modified: src/main/org/jboss/system/server/profileservice
ProfileServiceBootstrap.java ServerImpl.java
ProfileServiceImpl.java
Removed: src/main/org/jboss/system/server/profileservice
ServerPSBootstrap.java
Log:
Bootstrap the ProfileService implementation from the deployer-beans.xml and drop the unnecessary ServerPSBootstrap class.
Revision Changes Path
1.2 +70 -16 system2/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ProfileServiceBootstrap.java
===================================================================
RCS file: /cvsroot/jboss/system2/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ProfileServiceBootstrap.java 6 Jul 2006 03:30:21 -0000 1.1
+++ ProfileServiceBootstrap.java 9 Jul 2006 23:48:22 -0000 1.2
@@ -24,15 +24,20 @@
import java.net.URL;
import java.util.Enumeration;
+import org.jboss.deployers.spi.Deployment;
import org.jboss.deployers.spi.MainDeployer;
import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+import org.jboss.profileservice.spi.Profile;
+import org.jboss.profileservice.spi.ProfileKey;
+import org.jboss.profileservice.spi.ProfileService;
/**
- * An extension of the kernel basic bootstrap that adds a loadProfile(String)
- * hook to load beans into the kernel using the ProfileService.
+ * An extension of the kernel basic bootstrap that boots the mc from
+ * deployer-beans.xml descriptors using the BasicXMLDeployer, and loads
+ * additional deployments using the ProfileService.
*
* @author Sco...@jb...
* @version $Revision$
@@ -44,8 +49,10 @@
protected String profileName;
/** The kernel deployer used to load the server deployers */
protected BasicXMLDeployer kernelDeployer;
- /** The server MainkernelDeployer */
+ /** The server MainDeployer */
protected MainDeployer mainDeployer;
+ /** The server ProfileService */
+ protected ProfileService profileService;
public ProfileServiceBootstrap()
{
@@ -57,21 +64,33 @@
}
/**
- * Return the MainkernelDeployer bean.
- * @return the MainkernelDeployer bean if bootstrap succeeded, null otherwise.
+ * Return the MainDeployer bean.
+ * @return the MainDeployer bean if bootstrap succeeded, null otherwise.
*/
public MainDeployer getMainDeployer()
{
return mainDeployer;
}
-
- public BasicXMLDeployer getKernelkernelDeployer()
+ /**
+ * Return the ProfileService bean.
+ * @return the ProfileService bean if bootstrap succeeded, null otherwise
+ */
+ public ProfileService getProfileService()
+ {
+ return profileService;
+ }
+ /**
+ * Return the bootstrap XML kernel deployer.
+ * @return BasicXMLDeployer instance.
+ */
+ public BasicXMLDeployer getKernelDeployer()
{
return kernelDeployer;
}
/**
- * Boot the kernel by loading all kernelDeployer-beans.xml followed by the
+ * Boot the kernel by loading all deployer-beans.xml descriptors available
+ * on the classpath.
*
*/
public void bootstrap() throws Throwable
@@ -98,10 +117,10 @@
// Validate that everything is ok
kernelDeployer.validate();
- // Get the MainkernelDeployer
+ // Get the MainDeployer
KernelRegistry registry = getKernel().getRegistry();
- KernelRegistryEntry entry = registry.getEntry("MainDeployer");
- Object target = entry.getTarget();
+ KernelRegistryEntry mdEntry = registry.getEntry("MainDeployer");
+ Object target = mdEntry.getTarget();
if( target instanceof MainDeployer )
{
mainDeployer = (MainDeployer) target;
@@ -114,14 +133,31 @@
tmp.append(MainDeployer.class.getName());
throw new IllegalStateException(tmp.toString());
}
- log.debug("Using MainkernelDeployer: "+mainDeployer);
+ log.debug("Using MainDeployer: "+mainDeployer);
+
+ // Get the ProfileService
+ KernelRegistryEntry psEntry = registry.getEntry("ProfileService");
+ target = psEntry.getTarget();
+ if( target instanceof ProfileService )
+ {
+ profileService = (ProfileService) target;
+ }
+ else
+ {
+ StringBuilder tmp = new StringBuilder("Kernel entry ProfileService(");
+ tmp.append(profileService);
+ tmp.append(") is not an instanceof ");
+ tmp.append(ProfileService.class.getName());
+ throw new IllegalStateException(tmp.toString());
+ }
+ log.debug("Using ProfileService: "+profileService);
// Load the profile beans
loadProfile(profileName);
}
/**
- * Deploy a url
+ * Bootstrap deployment of the
*
* @param url the deployment url
* @throws Throwable for any error
@@ -150,13 +186,31 @@
/**
- * Load the beans associated with the named profile. Should be overriden
- * to do something meaningful.
+ * Load the deployments associated with the named profile and deploy them
+ * using the MainDeployer.
* @param name
* @throws Throwable
+ * @throws NullPointerException if either the MainDeployer or ProfileService
+ * have not been injected.
*/
protected void loadProfile(String name) throws Throwable
{
-
+ MainDeployer deployer = getMainDeployer();
+ if( deployer == null )
+ throw new NullPointerException("MainDeployer has not been set");
+ ProfileService ps = getProfileService();
+ if( ps == null )
+ throw new NullPointerException("ProfileService has not been set");
+
+ // Load the named profile
+ ProfileKey key = new ProfileKey(name);
+ Profile profile = ps.getProfile(key);
+ Deployment[] profileDeployments = profile.getDeployments();
+ // Deploy the profile deployments
+ for(Deployment d : profileDeployments)
+ {
+ log.debug("Deploying: "+d);
+ deployer.deploy(d);
+ }
}
}
1.3 +5 -5 system2/src/main/org/jboss/system/server/profileservice/ServerImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerImpl.java
===================================================================
RCS file: /cvsroot/jboss/system2/src/main/org/jboss/system/server/profileservice/ServerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ServerImpl.java 6 Jul 2006 06:49:41 -0000 1.2
+++ ServerImpl.java 9 Jul 2006 23:48:22 -0000 1.3
@@ -60,7 +60,7 @@
private final Package jbossPackage = Package.getPackage("org.jboss");
/** The kernel bootstrap */
- private ServerPSBootstrap bootstrap;
+ private ProfileServiceBootstrap bootstrap;
/** The basic configuration for the server. */
private ServerConfigImpl config;
@@ -319,7 +319,7 @@
startDate = new Date();
log.info("Starting MicroContainer");
- bootstrap = new ServerPSBootstrap(config.getServerName());
+ bootstrap = new ProfileServiceBootstrap(config.getServerName());
bootstrap.run();
// Install the shutdown hook
@@ -641,11 +641,11 @@
extends Thread
{
/** The ServiceController which we will ask to shut things down with. */
- private ServerPSBootstrap bootstrap;
+ private ProfileServiceBootstrap bootstrap;
private boolean forceHalt = true;
- public ShutdownHook(final ServerPSBootstrap bootstrap)
+ public ShutdownHook(final ProfileServiceBootstrap bootstrap)
{
super("JBoss Shutdown Hook");
@@ -704,7 +704,7 @@
{
try
{
- BasicKernelDeployer deployer = bootstrap.getKernelkernelDeployer();
+ BasicKernelDeployer deployer = bootstrap.getKernelDeployer();
deployer.shutdown();
}
catch (Exception e)
1.2 +9 -4 system2/src/main/org/jboss/system/server/profileservice/ProfileServiceImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ProfileServiceImpl.java
===================================================================
RCS file: /cvsroot/jboss/system2/src/main/org/jboss/system/server/profileservice/ProfileServiceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ProfileServiceImpl.java 6 Jul 2006 03:30:21 -0000 1.1
+++ ProfileServiceImpl.java 9 Jul 2006 23:48:22 -0000 1.2
@@ -40,12 +40,13 @@
public class ProfileServiceImpl
implements ProfileService
{
- protected Profile defatulImpl;
- private ManagementViewImpl mgtView;
+ private Profile defaultImpl;
+ private ManagementView mgtView;
public ProfileServiceImpl(String name) throws IOException
{
- defatulImpl = new ProfileImpl(name);
+ defaultImpl = new ProfileImpl(name);
+ mgtView = new ManagementViewImpl(this);
}
public String[] getDomains()
{
@@ -65,7 +66,7 @@
public Profile getProfile(ProfileKey key)
throws NoSuchProfileException
{
- return defatulImpl;
+ return defaultImpl;
}
public String[] getProfileDeploymentNames(ProfileKey key)
@@ -79,6 +80,10 @@
{
return mgtView;
}
+ public void setViewManager(ManagementView mgtView)
+ {
+ this.mgtView = mgtView;
+ }
// Admin of profiles @todo could be an option plugin
public Profile newProfile(ProfileKey key)
|
|
From: Scott S. <sco...@jb...> - 2006-07-09 23:45:59
|
User: starksm
Date: 06/07/09 19:45:53
Modified: src/main/org/jboss/system/server/profile/basic
ProfileImpl.java
Log:
Stub out the getDeployments method
Revision Changes Path
1.2 +14 -3 system2/src/main/org/jboss/system/server/profile/basic/ProfileImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ProfileImpl.java
===================================================================
RCS file: /cvsroot/jboss/system2/src/main/org/jboss/system/server/profile/basic/ProfileImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ProfileImpl.java 6 Jul 2006 03:30:32 -0000 1.1
+++ ProfileImpl.java 9 Jul 2006 23:45:53 -0000 1.2
@@ -21,19 +21,29 @@
*/
package org.jboss.system.server.profile.basic;
+import java.util.ArrayList;
import java.util.Map;
+import org.jboss.deployers.plugins.DeploymentImpl;
import org.jboss.deployers.spi.Deployment;
import org.jboss.profileservice.spi.DeploymentTemplate;
import org.jboss.profileservice.spi.NoSuchDeploymentException;
import org.jboss.profileservice.spi.Profile;
+/**
+ * A basic profile implementation that uses the filesystem to store
+ *
+ * @author Sco...@jb...
+ * @version $Revision$
+ */
public class ProfileImpl implements Profile
{
+ private String name;
+ private ArrayList<DeploymentImpl> deployments = new ArrayList<DeploymentImpl>();
public ProfileImpl(String name)
{
- // TODO Auto-generated constructor stub
+ this.name = name;
}
public String getVersion()
@@ -70,8 +80,9 @@
public Deployment[] getDeployments()
{
- // TODO Auto-generated method stub
- return null;
+ Deployment[] tmp = new Deployment[deployments.size()];
+ deployments.toArray(tmp);
+ return tmp;
}
public Map<String, Object> getConfig()
|
|
From: Scott S. <sco...@jb...> - 2006-07-09 22:12:52
|
User: starksm
Date: 06/07/09 18:12:50
Modified: src/main/org/jboss/system/server/jmx LazyMBeanServer.java
Log:
JBAS-3381, build two sets of jmx domain names to server mappings to determine which server should be used to handle a given ObjectName.
Revision Changes Path
1.6 +68 -6 jboss-system/src/main/org/jboss/system/server/jmx/LazyMBeanServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LazyMBeanServer.java
===================================================================
RCS file: /cvsroot/jboss/jboss-system/src/main/org/jboss/system/server/jmx/LazyMBeanServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- LazyMBeanServer.java 11 Nov 2005 05:10:12 -0000 1.5
+++ LazyMBeanServer.java 9 Jul 2006 22:12:50 -0000 1.6
@@ -24,6 +24,8 @@
import java.io.ObjectInputStream;
import java.lang.reflect.Constructor;
import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
import javax.management.MBeanServer;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
@@ -54,7 +56,7 @@
* and the jboss MBeanServer is available.
*
* @author Sco...@jb...
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class LazyMBeanServer
implements MBeanServer
@@ -64,6 +66,14 @@
private static MBeanServer platformServer;
private static String defaultDomain;
private static MBeanServerDelegate theDelegate;
+ /** A HashSet<String> of the jmx domain prefixes that need to be
+ * handled by the platform server
+ */
+ private static Set platformServerDomains = Collections.synchronizedSet(new HashSet());
+ /** A HashSet<String> of the jmx domain prefixes that need to be
+ * handled by the jboss server
+ */
+ private static Set serverDomains = Collections.synchronizedSet(new HashSet());
/**
* Called by the ServerImpl to reset theServer implementation to the jboss
@@ -86,6 +96,11 @@
Constructor ctor = c.getConstructor(sig);
theServer = (MBeanServer) ctor.newInstance(args);
coreServer = theServer;
+ String[] domains = theServer.getDomains();
+ for(int n = 0; n < domains.length; n ++)
+ {
+ serverDomains.add(domains[n]);
+ }
}
return coreServer;
}
@@ -104,6 +119,24 @@
return outerServer;
}
+ /**
+ * Updates the platformServerDomains and serverDomains sets of jmx
+ * domain names.
+ */
+ public static synchronized void reloadDomains()
+ {
+ // Initialize the platform server domains
+ String[] domains = platformServer.getDomains();
+ for(int n = 0; n < domains.length; n ++)
+ {
+ platformServerDomains.add(domains[n]);
+ }
+ domains = theServer.getDomains();
+ for(int n = 0; n < domains.length; n ++)
+ {
+ serverDomains.add(domains[n]);
+ }
+ }
LazyMBeanServer(String domain, MBeanServer outer,
MBeanServerDelegate delegate)
{
@@ -112,6 +145,12 @@
theServer = outer;
registeredServer = this;
theDelegate = delegate;
+ // Initialize the platform server domains
+ String[] domains = platformServer.getDomains();
+ for(int n = 0; n < domains.length; n ++)
+ {
+ platformServerDomains.add(domains[n]);
+ }
}
public ObjectInstance createMBean(String className, ObjectName name)
@@ -301,11 +340,30 @@
getServer(name).removeNotificationListener(name, listener, filter, handback);
}
+ /**
+ * Obtains the MBeanInfo for the given ObjectName. In the event of an
+ * InstanceNotFoundException, the jmx domain to server sets are reloaded
+ * by calling reloadDomains(), and the lookup retried.
+ * @param name
+ * @return
+ * @throws InstanceNotFoundException
+ * @throws IntrospectionException
+ * @throws ReflectionException
+ */
public MBeanInfo getMBeanInfo(ObjectName name)
throws InstanceNotFoundException, IntrospectionException,
ReflectionException
{
- MBeanInfo info = getServer(name).getMBeanInfo(name);
+ MBeanInfo info = null;
+ try
+ {
+ info = getServer(name).getMBeanInfo(name);
+ }
+ catch(InstanceNotFoundException e)
+ {
+ reloadDomains();
+ info = getServer(name).getMBeanInfo(name);
+ }
return info;
}
@@ -382,16 +440,20 @@
}
/**
- * Choose the MBeanServer based on the ObjectName domain. The current
- * implementation chooses the platform MBeanServer for any domain starting
- * with "java".
+ * Choose the MBeanServer based on the ObjectName domain. If the serverDomain
+ * contains the domain of the name, theServer is returned. If the
+ * platformServerDomains set contains the domain of the name, the
+ * platformServer is returned. For an unknown domain theServer is returned.
*
* @param name
* @return Either the platform MBeanServer, or the jboss MBeanServer
*/
private MBeanServer getServer(ObjectName name)
{
- if( name != null && name.getDomain().startsWith("java") )
+ String domain = name != null ? name.getDomain() : "";
+ if( serverDomains.contains(domain) )
+ return theServer;
+ if( platformServerDomains.contains(domain) )
return platformServer;
return theServer;
}
|
|
From: Scott S. <sco...@jb...> - 2006-07-09 22:05:25
|
User: starksm
Date: 06/07/09 18:05:23
Modified: src/main/org/jboss/system/server/jmx Tag: Branch_4_0
LazyMBeanServer.java
Log:
JBAS-3381, build two sets of jmx domain names to server mappings to determine which server should be used to handle a given ObjectName.
Revision Changes Path
No revision
No revision
1.1.2.5 +68 -6 jboss-system/src/main/org/jboss/system/server/jmx/LazyMBeanServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LazyMBeanServer.java
===================================================================
RCS file: /cvsroot/jboss/jboss-system/src/main/org/jboss/system/server/jmx/LazyMBeanServer.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- LazyMBeanServer.java 11 Nov 2005 05:06:28 -0000 1.1.2.4
+++ LazyMBeanServer.java 9 Jul 2006 22:05:23 -0000 1.1.2.5
@@ -24,6 +24,8 @@
import java.io.ObjectInputStream;
import java.lang.reflect.Constructor;
import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
import javax.management.MBeanServer;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
@@ -54,7 +56,7 @@
* and the jboss MBeanServer is available.
*
* @author Sco...@jb...
- * @version $Revision: 1.1.2.4 $
+ * @version $Revision: 1.1.2.5 $
*/
public class LazyMBeanServer
implements MBeanServer
@@ -64,6 +66,14 @@
private static MBeanServer platformServer;
private static String defaultDomain;
private static MBeanServerDelegate theDelegate;
+ /** A HashSet<String> of the jmx domain prefixes that need to be
+ * handled by the platform server
+ */
+ private static Set platformServerDomains = Collections.synchronizedSet(new HashSet());
+ /** A HashSet<String> of the jmx domain prefixes that need to be
+ * handled by the jboss server
+ */
+ private static Set serverDomains = Collections.synchronizedSet(new HashSet());
/**
* Called by the ServerImpl to reset theServer implementation to the jboss
@@ -86,6 +96,11 @@
Constructor ctor = c.getConstructor(sig);
theServer = (MBeanServer) ctor.newInstance(args);
coreServer = theServer;
+ String[] domains = theServer.getDomains();
+ for(int n = 0; n < domains.length; n ++)
+ {
+ serverDomains.add(domains[n]);
+ }
}
return coreServer;
}
@@ -104,6 +119,24 @@
return outerServer;
}
+ /**
+ * Updates the platformServerDomains and serverDomains sets of jmx
+ * domain names.
+ */
+ public static synchronized void reloadDomains()
+ {
+ // Initialize the platform server domains
+ String[] domains = platformServer.getDomains();
+ for(int n = 0; n < domains.length; n ++)
+ {
+ platformServerDomains.add(domains[n]);
+ }
+ domains = theServer.getDomains();
+ for(int n = 0; n < domains.length; n ++)
+ {
+ serverDomains.add(domains[n]);
+ }
+ }
LazyMBeanServer(String domain, MBeanServer outer,
MBeanServerDelegate delegate)
{
@@ -112,6 +145,12 @@
theServer = outer;
registeredServer = this;
theDelegate = delegate;
+ // Initialize the platform server domains
+ String[] domains = platformServer.getDomains();
+ for(int n = 0; n < domains.length; n ++)
+ {
+ platformServerDomains.add(domains[n]);
+ }
}
public ObjectInstance createMBean(String className, ObjectName name)
@@ -301,11 +340,30 @@
getServer(name).removeNotificationListener(name, listener, filter, handback);
}
+ /**
+ * Obtains the MBeanInfo for the given ObjectName. In the event of an
+ * InstanceNotFoundException, the jmx domain to server sets are reloaded
+ * by calling reloadDomains(), and the lookup retried.
+ * @param name
+ * @return
+ * @throws InstanceNotFoundException
+ * @throws IntrospectionException
+ * @throws ReflectionException
+ */
public MBeanInfo getMBeanInfo(ObjectName name)
throws InstanceNotFoundException, IntrospectionException,
ReflectionException
{
- MBeanInfo info = getServer(name).getMBeanInfo(name);
+ MBeanInfo info = null;
+ try
+ {
+ info = getServer(name).getMBeanInfo(name);
+ }
+ catch(InstanceNotFoundException e)
+ {
+ reloadDomains();
+ info = getServer(name).getMBeanInfo(name);
+ }
return info;
}
@@ -382,16 +440,20 @@
}
/**
- * Choose the MBeanServer based on the ObjectName domain. The current
- * implementation chooses the platform MBeanServer for any domain starting
- * with "java".
+ * Choose the MBeanServer based on the ObjectName domain. If the serverDomain
+ * contains the domain of the name, theServer is returned. If the
+ * platformServerDomains set contains the domain of the name, the
+ * platformServer is returned. For an unknown domain theServer is returned.
*
* @param name
* @return Either the platform MBeanServer, or the jboss MBeanServer
*/
private MBeanServer getServer(ObjectName name)
{
- if( name != null && name.getDomain().startsWith("java") )
+ String domain = name != null ? name.getDomain() : "";
+ if( serverDomains.contains(domain) )
+ return theServer;
+ if( platformServerDomains.contains(domain) )
return platformServer;
return theServer;
}
|
|
From: Alex L. <al...@jb...> - 2006-07-09 21:46:40
|
User: aloubyansky Date: 06/07/09 17:46:37 Modified: jboss/jbossxb/snapshot/lib jboss-xml-binding.jar Log: latest snapshot Revision Changes Path 1.17 +789 -804 repository.jboss.com/jboss/jbossxb/snapshot/lib/jboss-xml-binding.jar <<Binary file>> |
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 20:50:56
|
User: gurkanerdogdu
Date: 06/07/09 16:50:54
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal
TreeCacheManager.java
Log:
Java 1.4 related
Revision Changes Path
1.3 +4 -4 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/TreeCacheManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeCacheManager.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/TreeCacheManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- TreeCacheManager.java 6 Jul 2006 17:17:02 -0000 1.2
+++ TreeCacheManager.java 9 Jul 2006 20:50:54 -0000 1.3
@@ -201,10 +201,10 @@
manager.getTreeCache().remove(fqn);
}
- public static Map getListeners(TreeCacheManager manager)
- {
- return (Map)manager.getTreeCache().getTreeCacheListeners();
- }
+// public static Map getListeners(TreeCacheManager manager)
+// {
+// return (Map)manager.getTreeCache().getTreeCacheListeners();
+// }
public static void registerClassLoader(TreeCacheManager manager, String region, ClassLoader loader) throws Exception
{
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 20:50:56
|
User: gurkanerdogdu
Date: 06/07/09 16:50:54
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors
BaseXMLContentAssistProcessor.java
CacheXMLContentAssistProcessor.java
Log:
Java 1.4 related
Revision Changes Path
1.3 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/BaseXMLContentAssistProcessor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BaseXMLContentAssistProcessor.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/BaseXMLContentAssistProcessor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- BaseXMLContentAssistProcessor.java 6 Jul 2006 19:48:55 -0000 1.2
+++ BaseXMLContentAssistProcessor.java 9 Jul 2006 20:50:54 -0000 1.3
@@ -26,7 +26,6 @@
public abstract class BaseXMLContentAssistProcessor extends XMLContentAssistProcessor {
- @Override
protected void addTagNameProposals(ContentAssistRequest contentAssistRequest, int arg1){
// TODO Auto-generated method stub
1.3 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentAssistProcessor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheXMLContentAssistProcessor.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentAssistProcessor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CacheXMLContentAssistProcessor.java 6 Jul 2006 19:48:55 -0000 1.2
+++ CacheXMLContentAssistProcessor.java 9 Jul 2006 20:50:54 -0000 1.3
@@ -57,7 +57,6 @@
}
- @Override
protected List getTagValueProposals(String parentName,String matchString, int offset, ContentAssistRequest contentAssistRequest) {
if(parentName == null || parentName.equals(""))
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 20:50:56
|
User: gurkanerdogdu
Date: 06/07/09 16:50:54
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs
CacheLoaderDefDialog.java
Log:
Java 1.4 related
Revision Changes Path
1.4 +0 -2 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CacheLoaderDefDialog.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderDefDialog.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CacheLoaderDefDialog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CacheLoaderDefDialog.java 9 Jul 2006 04:37:50 -0000 1.3
+++ CacheLoaderDefDialog.java 9 Jul 2006 20:50:54 -0000 1.4
@@ -83,7 +83,6 @@
- @Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,true);
}
@@ -221,7 +220,6 @@
return txtDataSource;
}
- @Override
protected void okPressed() {
// TODO Auto-generated method stub
if(txtDataSource.getText() != null && !txtDataSource.getText().trim().equals(""))
|
|
From: Marshall C. <mcu...@jb...> - 2006-07-09 20:15:09
|
User: mculpepper
Date: 06/07/09 16:15:07
Removed: releng/org.jboss.ide.eclipse.releng/builders/cache
build.properties
Log:
removed build.properties (should be generated from the template file)
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 20:08:53
|
User: gurkanerdogdu
Date: 06/07/09 16:08:52
Added: cache/plugins/org.jboss.ide.eclipse.jbosscache/icons
search.gif property_obj.gif prop_ps.gif
Log:
Revision Changes Path
1.1 date: 2006/07/09 20:08:52; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/icons/search.gif
<<Binary file>>
1.1 date: 2006/07/09 20:08:52; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/icons/property_obj.gif
<<Binary file>>
1.1 date: 2006/07/09 20:08:52; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/icons/prop_ps.gif
<<Binary file>>
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 20:08:53
|
User: gurkanerdogdu
Date: 06/07/09 16:08:51
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache
plugin.properties plugin.xml
Log:
Revision Changes Path
1.2 +1 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/plugin.properties
(In the diff below, changes in quantity of whitespace are not shown.)
Index: plugin.properties
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- plugin.properties 13 Dec 2005 16:04:32 -0000 1.1
+++ plugin.properties 9 Jul 2006 20:08:51 -0000 1.2
@@ -2,5 +2,5 @@
cache.configuration.view.name=Cache Configuration
cache.content.view.name=Cache Content
cache.graph.view.name=Cache Object Graph
-cache.instance.wizard.name=Create New Cache Instance
+cache.instance.wizard.name=Create New Cache Configuration
cache.property.page.name=Cache Configuration Properties
\ No newline at end of file
1.4 +8 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/plugin.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: plugin.xml
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/plugin.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- plugin.xml 6 Jul 2006 17:18:00 -0000 1.3
+++ plugin.xml 9 Jul 2006 20:08:51 -0000 1.4
@@ -28,6 +28,13 @@
icon="icons/jboss.gif"
id="org.jboss.ide.eclipse.jbosscache.views.CacheGraphView"
name="%cache.graph.view.name"/>
+ <view
+ allowMultiple="false"
+ category="JBoss Cache"
+ class="org.jboss.ide.eclipse.jbosscache.views.statistic.CacheStatView"
+ icon="icons/jboss.gif"
+ id="org.jboss.ide.eclipse.jbosscache.view.StatisticContentView"
+ name="Cache Statistics"/>
</extension>
<extension
@@ -70,7 +77,7 @@
category="org.jboss.ide.eclipse.jbosscache.category.newCacheWizard"
class="org.jboss.ide.eclipse.jbosscache.wizards.RemoteConfigurationWizard"
hasPages="true"
- icon="icons/jboss.gif"
+ icon="icons/server.gif"
id="org.jboss.ide.eclipse.jbosscache.wizard3"
name="Create New Remote Cache Instance"
project="false"/>
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 20:08:53
|
User: gurkanerdogdu
Date: 06/07/09 16:08:52
Added: cache/plugins/org.jboss.ide.eclipse.jbosscache/dtd
cache-configuration.dtd
Log:
Revision Changes Path
1.1 date: 2006/07/09 20:08:52; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/dtd/cache-configuration.dtd
Index: cache-configuration.dtd
===================================================================
<!-- JBoss Cache file-based configuration document.
<!DOCTYPE mbean PUBLIC
"-//Cache/Cache Configuration DTD 1.0//EN"
"http://localhost/cache-configuration-1.0.dtd">
-->
<!ELEMENT server (classpath,mbean*)>
<!ELEMENT classpath EMPTY>
<!ATTLIST classpath codebase CDATA #REQUIRED>
<!ATTLIST classpath archives CDATA #REQUIRED>
<!ELEMENT mbean (depends,attribute*)>
<!ELEMENT depends (#PCDATA)>
<!ELEMENT attribute (#PCDATA|config)*>
<!ATTLIST attribute name CDATA #REQUIRED>
<!ELEMENT config (attribute?,buddyReplicationEnabled?,buddyLocatorClass?,buddyLocatorProperties?,buddyPoolName?,buddyCommunicationTimeout?,autoDataGravitation?,dataGravitationRemoveOnFind?,dataGravitationSearchBackupTrees?,passivation?,preload?,shared?,cacheloader*,region*)>
<!ELEMENT buddyReplicationEnabled (#PCDATA)>
<!ELEMENT buddyLocatorClass (#PCDATA)>
<!ELEMENT buddyLocatorProperties (#PCDATA)>
<!ELEMENT buddyPoolName (#PCDATA)>
<!ELEMENT buddyCommunicationTimeout (#PCDATA)>
<!ELEMENT autoDataGravitation (#PCDATA)>
<!ELEMENT dataGravitationRemoveOnFind (#PCDATA)>
<!ELEMENT dataGravitationSearchBackupTrees (#PCDATA)>
<!ELEMENT passivation (#PCDATA)>
<!ELEMENT preload (#PCDATA)>
<!ELEMENT shared (#PCDATA)>
<!ELEMENT cacheloader (class,properties,async,fetchPersistentState,ignoreModifications,purgeOnStartup)>
<!ELEMENT class (#PCDATA)>
<!ELEMENT properties (#PCDATA)>
<!ELEMENT async (#PCDATA)>
<!ELEMENT fetchPersistentState (#PCDATA)>
<!ELEMENT ignoreModifications (#PCDATA)>
<!ELEMENT purgeOnStartup (#PCDATA)>
<!ELEMENT region (attribute*)>
<!ATTLIST region name CDATA #REQUIRED>
<!ATTLIST region policyClass CDATA #REQUIRED>
<!ELEMENT class (#PCDATA)>
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 20:08:53
|
User: gurkanerdogdu
Date: 06/07/09 16:08:51
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/lib
jboss-aop.jar jgroups.jar jboss-cache.jar
Added: cache/plugins/org.jboss.ide.eclipse.jbosscache/lib
jdbm-1.0.jar jboss-serialization.jar derby.jar
Log:
Revision Changes Path
1.2 +1715 -921 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/jboss-aop.jar
<<Binary file>>
1.2 +6412 -7399jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/jgroups.jar
<<Binary file>>
1.3 +2552 -2316jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/jboss-cache.jar
<<Binary file>>
1.1 date: 2006/07/09 20:08:51; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/jdbm-1.0.jar
<<Binary file>>
1.1 date: 2006/07/09 20:08:51; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/jboss-serialization.jar
<<Binary file>>
1.1 date: 2006/07/09 20:08:51; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/lib/derby.jar
<<Binary file>>
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 19:50:37
|
User: gurkanerdogdu
Date: 06/07/09 15:50:36
Added: releng/org.jboss.ide.eclipse.releng/builders/cache
build.properties.template customTargets.xml
build.requires jbosside-cache.map build.properties
Log:
Cache Builder
Revision Changes Path
1.1 date: 2006/07/09 19:50:36; author: gurkanerdogdu; state: Exp;jbosside/releng/org.jboss.ide.eclipse.releng/builders/cache/build.properties.template
Index: build.properties.template
===================================================================
mapVersionTag=HEAD
buildDirectory=%build-output-directory%/eclipse
buildId=JBossIDE-EJB3-Build
buildLabel=${buildType}-build
baseLocation=${buildDirectory}
timestamp=007
collPlace=
collBase=.
configs=*,*,*
archivesFormat=*,*,* - zip
bootclasspath=${java.home}/lib/rt.jar
javacFailOnError=true
javacDebugInfo=on
javacVerbose=true
javaSource=1.4
javacTarget=1.4
collectingFolder=
archivePrefix=
zipargs=
tarargs=
buildTypeDescription.N=nightly
buildTypeDescription.I=integration
buildTypeDescription.R=release
include.plugins=\
org.apache.xerces,\
org.eclipse.draw2d,\
org.eclipse.emf.common,\
org.eclipse.emf.ecore,\
org.eclipse.emf.ecore.xmi,\
org.eclipse.gef,\
org.eclipse.jem.util,\
org.eclipse.wst.common.core,\
org.eclipse.wst.common.environment,\
org.eclipse.wst.common.frameworks,\
org.eclipse.wst.common.frameworks.ui,\
org.eclipse.wst.common.project.facet.core,\
org.eclipse.wst.common.ui,\
org.eclipse.wst.common.uriresolver,\
org.eclipse.wst.sse.core,\
org.eclipse.wst.sse.ui,\
org.eclipse.wst.validation,\
org.eclipse.wst.validation.ui,\
org.eclipse.wst.xml.core,\
org.eclipse.wst.xml.ui
1.1 date: 2006/07/09 19:50:36; author: gurkanerdogdu; state: Exp;jbosside/releng/org.jboss.ide.eclipse.releng/builders/cache/customTargets.xml
Index: customTargets.xml
===================================================================
<project name="Build specific targets and properties" default="noDefault" >
<taskdef classpath="../../bin" resource="org/jboss/ide/eclipse/releng/antlib.xml" />
<taskdef classpath="../../lib/ant-contrib.jar" resource="net/sf/antcontrib/antlib.xml"/>
<import file="../common/bundlePlugins.xml"/>
<import file="../common/common.xml"/>
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
<!-- ===================================================================== -->
<target name="allElements">
<ant antfile="${genericTargets}" target="${target}" >
<property name="customTargets" value="${builderDirectory}/customTargets.xml"/>
<property name="type" value="feature" />
<property name="id" value="org.jboss.ide.eclipse.jbosscache.feature" />
</ant>
</target>
<!-- ===================================================================== -->
<!-- Targets to assemble the built elements for particular configurations -->
<!-- These generally call the generated assemble scripts (named in -->
<!-- ${assembleScriptName}) but may also add pre and post processing -->
<!-- Add one target for each root element and each configuration -->
<!-- ===================================================================== -->
<target name="assemble.org.jboss.ide.eclipse.jbosscache.feature">
<property name="archiveName" value="JBossIDE-JBossCache-Tools-${versionTag}.zip"/>
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
<!-- ===================================================================== -->
<!-- Check out map files from correct repository -->
<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
<!-- ===================================================================== -->
<target name="getMapFiles">
<!-- we need to export the map file w/ the correct CVS tags -->
<copyMapFile builder="cache" buildDirectory="${buildDirectory}" cvsTag="${cvsTag}"/>
</target>
<!-- ===================================================================== -->
<!-- Steps to do before setup -->
<!-- ===================================================================== -->
<target name="preSetup">
<!-- clean up the build directory -->
<!--delete failonerror="true" includeemptydirs="true">
<fileset dir="${buildDirectory}" defaultexcludes="false"/>
</delete-->
<delete failonerror="false" includeemptydirs="true">
<fileset dir="${requirement.root}" defaultexcludes="false">
<include name="**/return.properties"/>
</fileset>
</delete>
</target>
<!-- ===================================================================== -->
<!-- Steps to do after setup but before starting the build proper -->
<!-- ===================================================================== -->
<target name="postSetup">
</target>
<!-- ===================================================================== -->
<!-- Steps to do before fetching the build elements -->
<!-- ===================================================================== -->
<target name="preFetch">
</target>
<!-- ===================================================================== -->
<!-- Steps to do after fetching the build elements -->
<!-- ===================================================================== -->
<target name="postFetch">
<condition property="append" else="false">
<not>
<equals arg1="${buildType}" arg2="R"/>
</not>
</condition>
<updateVersions type="plugin" version="${versionTag}" append="${append}"
failonerror="false" failonrecursiveerror="false">
<fileset dir="${buildDirectory}/plugins">
<include name="org.jboss.ide.eclipse.jbosscache"/>
</fileset>
</updateVersions>
<updateVersions type="feature" version="${versionTag}" append="${append}"
failonerror="false" failonrecursiveerror="false" updatePluginRefs="false">
<fileset dir="${buildDirectory}/features">
<include name="org.jboss.ide.eclipse.jbosscache.*"/>
</fileset>
</updateVersions>
</target>
<!-- ===================================================================== -->
<!-- Steps to do before generating the build scripts. -->
<!-- ===================================================================== -->
<target name="preGenerate">
</target>
<!-- ===================================================================== -->
<!-- Steps to do after generating the build scripts. -->
<!-- ===================================================================== -->
<target name="postGenerate">
</target>
<!-- ===================================================================== -->
<!-- Steps to do before running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
<target name="preProcess">
</target>
<!-- ===================================================================== -->
<!-- Steps to do after running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
<target name="postProcess">
</target>
<!-- ===================================================================== -->
<!-- Steps to do before running assemble. -->
<!-- ===================================================================== -->
<target name="preAssemble">
</target>
<!-- ===================================================================== -->
<!-- Steps to do after running assemble. -->
<!-- ===================================================================== -->
<target name="postAssemble">
<bundlePlugins pluginList="${include.plugins}" buildDirectory="${buildDirectory}"
archivePath="${buildDirectory}/${buildLabel}/JBossIDE-JBossCache-Tools-${versionTag}.zip" />
</target>
<!-- ===================================================================== -->
<!-- Steps to do after the build is done. -->
<!-- ===================================================================== -->
<target name="postBuild">
</target>
<!-- ===================================================================== -->
<!-- Steps to do to test the build results -->
<!-- ===================================================================== -->
<target name="test">
</target>
<!-- ===================================================================== -->
<!-- Steps to do to publish the build results -->
<!-- ===================================================================== -->
<target name="publish">
</target>
<!-- ===================================================================== -->
<!-- Default target -->
<!-- ===================================================================== -->
<target name="noDefault">
<echo message="You must specify a target when invoking this file" />
</target>
</project>
1.1 date: 2006/07/09 19:50:36; author: gurkanerdogdu; state: Exp;jbosside/releng/org.jboss.ide.eclipse.releng/builders/cache/build.requires
Index: build.requires
===================================================================
builder.requires=eclipse,emf-sdo-xsd,gef,jem,webtools
1.1 date: 2006/07/09 19:50:36; author: gurkanerdogdu; state: Exp;jbosside/releng/org.jboss.ide.eclipse.releng/builders/cache/jbosside-cache.map
Index: jbosside-cache.map
===================================================================
fe...@or...lipse.jbosscache.feature=%cvsTag%,:pserver:ano...@an...:/cvsroot/jboss,,jbosside/cache/features/org.jboss.ide.eclipse.jbosscache.feature
pl...@or...lipse.jbosscache=%cvsTag%,:pserver:ano...@an...:/cvsroot/jboss,,jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache
1.1 date: 2006/07/09 19:50:36; author: gurkanerdogdu; state: Exp;jbosside/releng/org.jboss.ide.eclipse.releng/builders/cache/build.properties
Index: build.properties
===================================================================
mapVersionTag=HEAD
buildDirectory=D:/JBossIDEBuild/eclipse
buildId=JBossIDE-EJB3-Build
buildLabel=${buildType}-build
baseLocation=${buildDirectory}
timestamp=007
collPlace=
collBase=.
configs=*,*,*
archivesFormat=*,*,* - zip
bootclasspath=${java.home}/lib/rt.jar
javacFailOnError=true
javacDebugInfo=on
javacVerbose=true
javaSource=1.4
javacTarget=1.4
collectingFolder=
archivePrefix=
zipargs=
tarargs=
buildTypeDescription.N=nightly
buildTypeDescription.I=integration
buildTypeDescription.R=release
include.plugins=\
org.apache.xerces,\
org.eclipse.draw2d,\
org.eclipse.emf.common,\
org.eclipse.emf.ecore,\
org.eclipse.emf.ecore.xmi,\
org.eclipse.gef,\
org.eclipse.jem.util,\
org.eclipse.wst.common.core,\
org.eclipse.wst.common.environment,\
org.eclipse.wst.common.frameworks,\
org.eclipse.wst.common.frameworks.ui,\
org.eclipse.wst.common.project.facet.core,\
org.eclipse.wst.common.ui,\
org.eclipse.wst.common.uriresolver,\
org.eclipse.wst.sse.core,\
org.eclipse.wst.sse.ui,\
org.eclipse.wst.validation,\
org.eclipse.wst.validation.ui,\
org.eclipse.wst.xml.core,\
org.eclipse.wst.xml.ui
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 19:50:32
|
User: gurkanerdogdu Date: 06/07/09 15:50:29 Log: Directory /cvsroot/jboss/jbosside/releng/org.jboss.ide.eclipse.releng/builders/cache added to the repository |
185 messages has been excluded from this view by a project administrator.
