commonjava-developer Mailing List for CommonJava Open Component Project (Page 2)
Brought to you by:
johnqueso
Menu
▾
▴
commonjava-developer — developers list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(10) |
Feb
(114) |
Mar
(169) |
Apr
(25) |
May
|
Jun
(5) |
Jul
(17) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: John C. <joh...@co...> - 2004-04-20 22:52:53
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-reflection/src/java/org/commonjava/reflection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13812/src/java/org/commonjava/reflection Modified Files: ImplFinder.java Reflector.java Log Message: added invokeStatic(Class, String, Object[]): Object to Reflector. Index: ImplFinder.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-reflection/src/java/org/commonjava/reflection/ImplFinder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ImplFinder.java 22 Oct 2003 04:23:10 -0000 1.3 +++ ImplFinder.java 20 Apr 2004 22:52:02 -0000 1.4 @@ -533,7 +533,7 @@ *@throws ConfigurationManagerException in the case of an invalid configuration file */ private static Class discoverClass(Class ifc, String sProp, String cFile, Class defImpl) - throws ClassNotFoundException, IOException + throws ClassNotFoundException, IOException, FinderException { String ifcName = ifc.getName(); ClassLoader cloader = ImplFinder.class.getClassLoader(); @@ -584,7 +584,12 @@ // If all else fails, then return the default implementation supplied. if(classFile == null){ - return defImpl; + if(defImpl == null){ + throw new FinderException("Error finding implementation of class: " + ifc.getName()); + } + else{ + return defImpl; + } } // Otherwise, load the class... else{ Index: Reflector.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-reflection/src/java/org/commonjava/reflection/Reflector.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Reflector.java 27 Feb 2004 06:43:59 -0000 1.2 +++ Reflector.java 20 Apr 2004 22:52:05 -0000 1.3 @@ -161,6 +161,49 @@ } } + /** Invoke the specified static method with the specified params... + * + * @param targetClass The target class of the invocation + * @param methodName The method name to invoke + * @param params The parameters to pass to the method invocation + * @return The result of the method call + * @throws ReflectorException In case of an error looking up or invoking the method. + */ + public static Object invokeStatic(Class targetClass, String methodName, Object[] params) + throws ReflectorException + { + if(params == null){params = new Object[0];} + + Class[] paramTypes = new Class[params.length]; + for(int i=0, len=params.length; i<len; i++){ + paramTypes[i] = params[i].getClass(); + } + + try{ + Method method = getMethod(targetClass, methodName, paramTypes); + if(method == null){ + StringBuffer buffer = new StringBuffer(); + buffer.append("Singleton-producing method named \'" + methodName + "\' not found with specified parameter classes: "); + + for (int i = 0; i < paramTypes.length; i++) { + buffer.append(paramTypes[i].getName()); + buffer.append(','); + } + buffer.setLength(buffer.length() -1); + + throw new ReflectorException(buffer.toString()); + } + + return method.invoke(null, params); + } + catch(InvocationTargetException ex){ + throw new ReflectorException(ex); + } + catch(IllegalAccessException ex){ + throw new ReflectorException(ex); + } + } + /** Return the constructor, checking the cache first and storing in cache if not * already there.. * |
|
From: John C. <joh...@co...> - 2004-04-20 22:52:26
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-reflection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13812 Modified Files: project.xml Log Message: added invokeStatic(Class, String, Object[]): Object to Reflector. Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-reflection/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- project.xml 27 Feb 2004 06:43:59 -0000 1.3 +++ project.xml 20 Apr 2004 22:52:06 -0000 1.4 @@ -5,7 +5,7 @@ <id>commonjava-reflection</id> <name>Reflective Utilities</name> <groupId>commonjava</groupId> - <currentVersion>2.0-1</currentVersion> + <currentVersion>2.0-2</currentVersion> <organization> <name>CommonJava Open Component Project</name> <url>http://www.commonjava.org</url> |
|
From: John C. <joh...@co...> - 2004-04-15 15:24:05
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-console/src/java/org/commonjava/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7831/src/java/org/commonjava/console Modified Files: CommandLine.java Log Message: finally replaced that sysout call for "best score" with a LOG.debug call. Index: CommandLine.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-console/src/java/org/commonjava/console/CommandLine.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CommandLine.java 17 Nov 2003 21:27:23 -0000 1.2 +++ CommandLine.java 15 Apr 2004 15:23:54 -0000 1.3 @@ -218,7 +218,9 @@ // } - System.out.println("bestScore after parseArgs = " + bestScore); + if(LOG.isDebugEnabled()){ + LOG.debug("bestScore after parseArgs = " + bestScore); + } } public String[] getArguments(){ |
|
From: John C. <joh...@co...> - 2004-04-13 16:57:33
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/core/src/main/java/org/commonjava/j2ee/services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7211/projects/core/src/main/java/org/commonjava/j2ee/services Modified Files: AbstractManager.java Log Message: updated to work...found a bug in the default constructor for the abstract manager...service locator wasn't being init'ed. Index: AbstractManager.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/core/src/main/java/org/commonjava/j2ee/services/AbstractManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AbstractManager.java 23 Mar 2004 14:58:56 -0000 1.1 +++ AbstractManager.java 13 Apr 2004 16:43:02 -0000 1.2 @@ -15,6 +15,7 @@ * */ protected AbstractManager() { + this.locator = new ServiceLocator(); } protected AbstractManager(ServiceLocator locator){ |
|
From: John C. <joh...@co...> - 2004-04-13 16:57:13
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7211 Modified Files: project.properties Log Message: updated to work...found a bug in the default constructor for the abstract manager...service locator wasn't being init'ed. Index: project.properties =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/project.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- project.properties 9 Apr 2004 22:21:06 -0000 1.4 +++ project.properties 13 Apr 2004 16:43:02 -0000 1.5 @@ -1,5 +1,7 @@ maven.username=jdcasey +maven.multiproject.includes=projects/*/project.xml + maven.repo.remote=http://www.ibiblio.org/maven,http://www.commonjava.org/maven maven.repo.central=www.commonjava.org maven.repo.central.directory=/usr/local/maven-repository |
|
From: John C. <joh...@co...> - 2004-04-09 23:32:26
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-opl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8962 Modified Files: Tag: OPL_2_2_DEV .classpath Log Message: sync'ing Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/.classpath,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -d -r1.14 -r1.14.2.1 --- .classpath 25 Mar 2004 02:14:13 -0000 1.14 +++ .classpath 9 Apr 2004 23:19:03 -0000 1.14.2.1 @@ -2,18 +2,10 @@ <classpath> <classpathentry kind="src" path="src/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test"/> - <classpathentry kind="src" path="projects/opl-xdoclet/src/java"/> - <classpathentry kind="src" path="projects/opl-xdoclet/test-project/src/java"/> - <classpathentry kind="src" path="projects/opl-xdoclet/test-project/target/generated-src"/> <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/> <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0-3.jar"/> <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.2.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/qdox/jars/qdox-1.4-SNAPSHOT.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/generama/jars/generama-1.0-alpha-1-SNAPSHOT.jar"/> <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-io-2.0-1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/picocontainer/jars/picocontainer-1.0-RC-1-SNAPSHOT.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/xdoclet/jars/xdoclet-2.0-alpha-1-SNAPSHOT.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/ant/jars/ant-1.6.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> |
|
From: John C. <joh...@co...> - 2004-04-09 22:35:53
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-config-jndi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31688 Modified Files: project.xml .classpath Log Message: updated to add some func's like getBaseContext() Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config-jndi/.classpath,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- .classpath 20 Feb 2004 21:16:53 -0000 1.6 +++ .classpath 9 Apr 2004 22:22:30 -0000 1.7 @@ -1,30 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> - <classpath> - <classpathentry kind="src" path="src\java"> - </classpathentry> - <classpathentry output="target\test-classes" kind="src" path="src\test"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"> - </classpathentry> - <classpathentry kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB" sourcepath="JRE_SRC"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-opl-2.1-5.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-lang-2.0-1.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-config-2.1-1.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-io-2.0.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-reflection-2.0.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0-3.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.2.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-1.0.1.jar"> - </classpathentry> - <classpathentry kind="output" path="target\classes"> - </classpathentry> -</classpath> \ No newline at end of file + <classpathentry kind="src" path="src/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/test"/> + <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> + <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-opl-2.1-5.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-lang-2.0-1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-config-2.1-1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-io-2.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-reflection-2.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-1.0.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0-5.jar"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config-jndi/project.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- project.xml 22 Mar 2004 15:51:14 -0000 1.9 +++ project.xml 9 Apr 2004 22:22:30 -0000 1.10 @@ -5,7 +5,7 @@ <id>commonjava-config-jndi</id> <name>JNDI Configurations</name> <groupId>commonjava</groupId> - <currentVersion>2.1-5</currentVersion> + <currentVersion>2.1-6</currentVersion> <organization> <name>CommonJava Open Component Project</name> <url>http://www.commonjava.org</url> @@ -22,14 +22,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-opl</artifactId> - <version>2.1-5</version> - <url>http://www.commonjava.org</url> - </dependency> - - <dependency> - <groupId>commonjava</groupId> - <artifactId>commonjava-lang</artifactId> - <version>2.0-1</version> + <version>2.1-6</version> <url>http://www.commonjava.org</url> </dependency> @@ -43,21 +36,21 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-io</artifactId> - <version>2.0</version> + <version>2.0-1</version> <url>http://www.commonjava.org</url> </dependency> <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-reflection</artifactId> - <version>2.0</version> + <version>2.0-1</version> <url>http://www.commonjava.org</url> </dependency> <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-util</artifactId> - <version>2.0-3</version> + <version>2.0-5</version> <url>http://www.commonjava.org</url> </dependency> |
|
From: John C. <joh...@co...> - 2004-04-09 22:34:33
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/service-manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31318/projects/service-manager Modified Files: project.properties Log Message: sync'ing up for small changes... Index: project.properties =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/service-manager/project.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.properties 23 Mar 2004 14:58:56 -0000 1.1 +++ project.properties 9 Apr 2004 22:21:07 -0000 1.2 @@ -1,4 +1,4 @@ -maven.username=maven +maven.username=jdcasey maven.repo.remote=http://www.ibiblio.org/maven,http://www.commonjava.org/maven maven.repo.central=www.commonjava.org |
|
From: John C. <joh...@co...> - 2004-04-09 22:34:33
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jms-manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31318/projects/jms-manager Modified Files: project.properties Log Message: sync'ing up for small changes... Index: project.properties =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jms-manager/project.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.properties 23 Mar 2004 14:58:57 -0000 1.1 +++ project.properties 9 Apr 2004 22:21:07 -0000 1.2 @@ -1,4 +1,4 @@ -maven.username=maven +maven.username=jdcasey maven.repo.remote=http://www.ibiblio.org/maven,http://www.commonjava.org/maven maven.repo.central=www.commonjava.org |
|
From: John C. <joh...@co...> - 2004-04-09 22:34:33
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/ejb-manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31318/projects/ejb-manager Modified Files: project.properties Log Message: sync'ing up for small changes... Index: project.properties =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/ejb-manager/project.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.properties 23 Mar 2004 14:58:52 -0000 1.1 +++ project.properties 9 Apr 2004 22:21:06 -0000 1.2 @@ -1,4 +1,4 @@ -maven.username=maven +maven.username=jdcasey maven.repo.remote=http://www.ibiblio.org/maven,http://www.commonjava.org/maven maven.repo.central=www.commonjava.org |
|
From: John C. <joh...@co...> - 2004-04-09 22:34:32
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31318 Modified Files: project.properties .classpath Log Message: sync'ing up for small changes... Index: project.properties =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/project.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- project.properties 23 Mar 2004 14:58:51 -0000 1.3 +++ project.properties 9 Apr 2004 22:21:06 -0000 1.4 @@ -1,4 +1,4 @@ -maven.username=maven +maven.username=jdcasey maven.repo.remote=http://www.ibiblio.org/maven,http://www.commonjava.org/maven maven.repo.central=www.commonjava.org Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/.classpath,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- .classpath 8 Apr 2004 15:19:35 -0000 1.6 +++ .classpath 9 Apr 2004 22:21:06 -0000 1.7 @@ -1,30 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="projects/core/src/main/java"/> - <classpathentry kind="src" path="projects/core/src/main/resources"/> - <classpathentry kind="src" path="projects/core/src/test/java"/> - <classpathentry kind="src" path="projects/core/src/test/resources"/> <classpathentry kind="src" path="projects/ejb-manager/src/main/java"/> - <classpathentry kind="src" path="projects/ejb-manager/src/test/java"/> <classpathentry kind="src" path="projects/jdbc-manager/src/main/java"/> - <classpathentry kind="src" path="projects/jdbc-manager/src/test/java"/> <classpathentry kind="src" path="projects/jms-manager/src/main/java"/> - <classpathentry kind="src" path="projects/jms-manager/src/test/java"/> <classpathentry kind="src" path="projects/service-manager/src/main/java"/> - <classpathentry kind="src" path="projects/service-manager/src/test/java"/> - <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-lang-2.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-opl-2.1-5.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-io-2.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0-5.jar"/> <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-config-2.1-1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-reflection-2.0.jar"/> <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"/> <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"/> <classpathentry kind="var" path="MAVEN_REPO/ejb/jars/ejb-2.1.jar"/> <classpathentry kind="var" path="MAVEN_REPO/jms/jars/javax.jms-1.1.jar"/> <classpathentry kind="var" path="MAVEN_REPO/jms/jars/jms-1.1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-config-jndi-2.1-5.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0-5.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-io-2.0-1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-opl-2.1-6.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-reflection-2.0-1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-config-jndi-2.1-6.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> |
|
From: John C. <joh...@co...> - 2004-04-09 22:34:32
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jdbc-manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31318/projects/jdbc-manager Modified Files: project.properties Log Message: sync'ing up for small changes... Index: project.properties =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jdbc-manager/project.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.properties 23 Mar 2004 14:58:57 -0000 1.1 +++ project.properties 9 Apr 2004 22:21:06 -0000 1.2 @@ -1,4 +1,4 @@ -maven.username=maven +maven.username=jdcasey maven.repo.remote=http://www.ibiblio.org/maven,http://www.commonjava.org/maven maven.repo.central=www.commonjava.org |
|
From: John C. <joh...@co...> - 2004-04-09 22:34:28
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31318/projects/core Modified Files: core-deps.ent project.properties Log Message: sync'ing up for small changes... Index: core-deps.ent =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/core/core-deps.ent,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- core-deps.ent 23 Mar 2004 14:58:56 -0000 1.1 +++ core-deps.ent 9 Apr 2004 22:21:05 -0000 1.2 @@ -23,7 +23,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-config-jndi</artifactId> - <version>2.1-5</version> + <version>2.1-6</version> <url>http://www.commonjava.org</url> </dependency> Index: project.properties =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/core/project.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.properties 23 Mar 2004 14:58:56 -0000 1.1 +++ project.properties 9 Apr 2004 22:21:06 -0000 1.2 @@ -1,4 +1,4 @@ -maven.username=maven +maven.username=jdcasey maven.repo.remote=http://www.ibiblio.org/maven,http://www.commonjava.org/maven maven.repo.central=www.commonjava.org |
|
From: John C. <joh...@co...> - 2004-04-08 15:33:13
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jdbc-manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1684/projects/jdbc-manager Modified Files: project.xml Log Message: refactored to provide an interface and default impl for each manager type, instead of merely a manager concrete impl. This will allow for easier mocking. Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jdbc-manager/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.xml 23 Mar 2004 14:58:57 -0000 1.1 +++ project.xml 8 Apr 2004 15:19:34 -0000 1.2 @@ -32,6 +32,12 @@ </description> <dependencies> + <dependency> + <groupId>commonjava</groupId> + <artifactId>commonjava-es-core</artifactId> + <version>2.2</version> + </dependency> + &core-deps; </dependencies> |
|
From: John C. <joh...@co...> - 2004-04-08 15:32:46
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jms-manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1684/projects/jms-manager Modified Files: project.xml Log Message: refactored to provide an interface and default impl for each manager type, instead of merely a manager concrete impl. This will allow for easier mocking. Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jms-manager/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.xml 23 Mar 2004 14:58:57 -0000 1.1 +++ project.xml 8 Apr 2004 15:19:36 -0000 1.2 @@ -32,6 +32,13 @@ </description> <dependencies> + + <dependency> + <groupId>commonjava</groupId> + <artifactId>commonjava-es-core</artifactId> + <version>2.2</version> + </dependency> + &core-deps; <dependency> <groupId>jms</groupId> |
|
From: John C. <joh...@co...> - 2004-04-08 15:32:46
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1684 Modified Files: .classpath project.xml Log Message: refactored to provide an interface and default impl for each manager type, instead of merely a manager concrete impl. This will allow for easier mocking. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/.classpath,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- .classpath 23 Mar 2004 14:58:51 -0000 1.5 +++ .classpath 8 Apr 2004 15:19:35 -0000 1.6 @@ -15,7 +15,6 @@ <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/> <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-lang-2.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0-2.jar"/> <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-opl-2.1-5.jar"/> <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-io-2.0.jar"/> <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-config-2.1-1.jar"/> @@ -26,5 +25,6 @@ <classpathentry kind="var" path="MAVEN_REPO/jms/jars/javax.jms-1.1.jar"/> <classpathentry kind="var" path="MAVEN_REPO/jms/jars/jms-1.1.jar"/> <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-config-jndi-2.1-5.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0-5.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- project.xml 23 Mar 2004 14:58:51 -0000 1.5 +++ project.xml 8 Apr 2004 15:19:36 -0000 1.6 @@ -38,7 +38,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-util</artifactId> - <version>2.0-2</version> + <version>2.0-5</version> <url>http://www.commonjava.org</url> </dependency> |
|
From: John C. <joh...@co...> - 2004-04-08 15:32:46
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jdbc-manager/src/main/java/org/commonjava/j2ee/services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1684/projects/jdbc-manager/src/main/java/org/commonjava/j2ee/services Modified Files: JDBCManager.java Added Files: DefaultJDBCManager.java Log Message: refactored to provide an interface and default impl for each manager type, instead of merely a manager concrete impl. This will allow for easier mocking. Index: JDBCManager.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jdbc-manager/src/main/java/org/commonjava/j2ee/services/JDBCManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- JDBCManager.java 23 Mar 2004 14:58:58 -0000 1.1 +++ JDBCManager.java 8 Apr 2004 15:19:36 -0000 1.2 @@ -1,47 +1,27 @@ -/* Created on Mar 22, 2004 */ +/* + * Created on Apr 8, 2004 + * + */ package org.commonjava.j2ee.services; import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; import javax.sql.DataSource; import org.commonjava.config.snapin.SnapInLoaderException; -import org.commonjava.j2ee.services.ServiceLocator; -/** - * @author jdcasey +//TODO: Add JavaDoc to JDBCManager in commonjava-enterprise-services! +/** + * + * @ + * */ -public final class JDBCManager extends AbstractManager{ - +public interface JDBCManager { public static final String STANDARD_JDBC_JNDI_CONFIG_NAME = "jdbc"; - - /** - * - */ - public JDBCManager() { - setJndiConfigName(STANDARD_JDBC_JNDI_CONFIG_NAME); - } - - public JDBCManager(ServiceLocator locator){ - super(locator); - setJndiConfigName(STANDARD_JDBC_JNDI_CONFIG_NAME); - } /** Retrieve the JNDI configuration for JDBC lookups, then lookup the specified * jndi binding and return a JDBC DataSource. * @param jndiName The JNDI binding */ - public DataSource getDataSource(String jndiName) - throws NamingException, SnapInLoaderException - { - Object result = getLocator().lookup(getJndiConfigName(), jndiName); - - // not sure this is ever necessary... - if(result != null && !DataSource.class.isInstance(result)){ - result = PortableRemoteObject.narrow(result, DataSource.class); - } - - return (DataSource)result; - } - -} + public abstract DataSource getDataSource(String jndiName) + throws NamingException, SnapInLoaderException; +} \ No newline at end of file --- NEW FILE: DefaultJDBCManager.java --- /* Created on Mar 22, 2004 */ package org.commonjava.j2ee.services; import javax.naming.NamingException; import javax.rmi.PortableRemoteObject; import javax.sql.DataSource; import org.commonjava.config.snapin.SnapInLoaderException; import org.commonjava.j2ee.services.ServiceLocator; /** * @author jdcasey */ public final class DefaultJDBCManager extends AbstractManager implements JDBCManager{ /** * */ public DefaultJDBCManager() { setJndiConfigName(STANDARD_JDBC_JNDI_CONFIG_NAME); } public DefaultJDBCManager(ServiceLocator locator){ super(locator); setJndiConfigName(STANDARD_JDBC_JNDI_CONFIG_NAME); } /** Retrieve the JNDI configuration for JDBC lookups, then lookup the specified * jndi binding and return a JDBC DataSource. * @param jndiName The JNDI binding */ public DataSource getDataSource(String jndiName) throws NamingException, SnapInLoaderException { Object result = getLocator().lookup(getJndiConfigName(), jndiName); // not sure this is ever necessary... if(result != null && !DataSource.class.isInstance(result)){ result = PortableRemoteObject.narrow(result, DataSource.class); } return (DataSource)result; } } |
|
From: John C. <joh...@co...> - 2004-04-08 15:32:45
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/service-manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1684/projects/service-manager Modified Files: project.xml Log Message: refactored to provide an interface and default impl for each manager type, instead of merely a manager concrete impl. This will allow for easier mocking. Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/service-manager/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.xml 23 Mar 2004 14:58:56 -0000 1.1 +++ project.xml 8 Apr 2004 15:19:36 -0000 1.2 @@ -32,6 +32,12 @@ </description> <dependencies> + <dependency> + <groupId>commonjava</groupId> + <artifactId>commonjava-es-core</artifactId> + <version>2.2</version> + </dependency> + &core-deps; </dependencies> |
|
From: John C. <joh...@co...> - 2004-04-08 15:32:45
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jms-manager/src/main/java/org/commonjava/j2ee/services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1684/projects/jms-manager/src/main/java/org/commonjava/j2ee/services Modified Files: JMSManager.java Added Files: DefaultJMSManager.java Log Message: refactored to provide an interface and default impl for each manager type, instead of merely a manager concrete impl. This will allow for easier mocking. --- NEW FILE: DefaultJMSManager.java --- /* Created on Mar 22, 2004 */ package org.commonjava.j2ee.services; import javax.jms.Queue; import javax.jms.QueueConnectionFactory; import javax.naming.NamingException; import javax.rmi.PortableRemoteObject; import org.commonjava.config.snapin.SnapInLoaderException; /** * @author jdcasey */ public final class DefaultJMSManager extends AbstractManager implements JMSManager{ /** * */ public DefaultJMSManager() { setJndiConfigName(STANDARD_JMS_JNDI_CONFIG_NAME); } public DefaultJMSManager(ServiceLocator locator){ super(locator); setJndiConfigName(STANDARD_JMS_JNDI_CONFIG_NAME); } public Queue getQueue(String jndiName) throws NamingException, SnapInLoaderException { Object result = getLocator().lookup(getJndiConfigName(), jndiName); // shouldn't have to do this, but just in case... if(result != null && !Queue.class.isInstance(result)){ result = PortableRemoteObject.narrow(result, Queue.class); } return (Queue)result; } public QueueConnectionFactory getQueueConnectionFactory(String jndiName) throws NamingException, SnapInLoaderException { Object result = getLocator().lookup(getJndiConfigName(), jndiName); // shouldn't have to do this, but just in case... if(result != null && !QueueConnectionFactory.class.isInstance(result)){ result = PortableRemoteObject.narrow(result, QueueConnectionFactory.class); } return (QueueConnectionFactory)result; } } Index: JMSManager.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/jms-manager/src/main/java/org/commonjava/j2ee/services/JMSManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- JMSManager.java 23 Mar 2004 14:58:59 -0000 1.1 +++ JMSManager.java 8 Apr 2004 15:19:35 -0000 1.2 @@ -1,56 +1,26 @@ -/* Created on Mar 22, 2004 */ +/* + * Created on Apr 8, 2004 + * + */ package org.commonjava.j2ee.services; import javax.jms.Queue; import javax.jms.QueueConnectionFactory; import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; import org.commonjava.config.snapin.SnapInLoaderException; - -/** - * @author jdcasey +//TODO: Add JavaDoc to JMSManager in commonjava-enterprise-services! +/** + * + * @ + * */ -public final class JMSManager extends AbstractManager{ - +public interface JMSManager { public static final String STANDARD_JMS_JNDI_CONFIG_NAME = "jms"; - - /** - * - */ - public JMSManager() { - setJndiConfigName(STANDARD_JMS_JNDI_CONFIG_NAME); - } - - public JMSManager(ServiceLocator locator){ - super(locator); - setJndiConfigName(STANDARD_JMS_JNDI_CONFIG_NAME); - } - - public Queue getQueue(String jndiName) throws NamingException, SnapInLoaderException - { - Object result = getLocator().lookup(getJndiConfigName(), jndiName); - - // shouldn't have to do this, but just in case... - if(result != null && !Queue.class.isInstance(result)){ - result = PortableRemoteObject.narrow(result, Queue.class); - } - - return (Queue)result; - } - - public QueueConnectionFactory getQueueConnectionFactory(String jndiName) - throws NamingException, SnapInLoaderException - { - Object result = getLocator().lookup(getJndiConfigName(), jndiName); - - // shouldn't have to do this, but just in case... - if(result != null && !QueueConnectionFactory.class.isInstance(result)){ - result = PortableRemoteObject.narrow(result, QueueConnectionFactory.class); - } - - return (QueueConnectionFactory)result; - } -} + public abstract Queue getQueue(String jndiName) + throws NamingException, SnapInLoaderException; + public abstract QueueConnectionFactory getQueueConnectionFactory(String jndiName) + throws NamingException, SnapInLoaderException; +} \ No newline at end of file |
|
From: John C. <joh...@co...> - 2004-04-08 15:32:45
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/service-manager/src/main/java/org/commonjava/j2ee/services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1684/projects/service-manager/src/main/java/org/commonjava/j2ee/services Modified Files: ServiceManager.java Added Files: DefaultServiceManager.java Log Message: refactored to provide an interface and default impl for each manager type, instead of merely a manager concrete impl. This will allow for easier mocking. --- NEW FILE: DefaultServiceManager.java --- /* Created on Mar 22, 2004 */ package org.commonjava.j2ee.services; import javax.naming.NamingException; import javax.rmi.PortableRemoteObject; import org.commonjava.config.snapin.SnapInLoaderException; import org.commonjava.j2ee.services.ServiceLocator; /** * @author jdcasey */ public final class DefaultServiceManager extends AbstractManager implements ServiceManager{ /** * */ public DefaultServiceManager() { setJndiConfigName(STANDARD_SVC_JNDI_CONFIG_NAME); } public DefaultServiceManager(ServiceLocator locator){ super(locator); setJndiConfigName(STANDARD_SVC_JNDI_CONFIG_NAME); } /** Retrieve the JNDI configuration for Service lookups, then lookup the specified * jndi binding and return a service object, cast to the specified class. * @param jndiName The JNDI binding * @param castTo The class to cast the lookup result to. */ public Object getService(String jndiName, Class castTo) throws NamingException, SnapInLoaderException { Object result = getLocator().lookup(getJndiConfigName(), jndiName); if(result != null && !castTo.isInstance(result)){ result = PortableRemoteObject.narrow(result, castTo); } return result; } } Index: ServiceManager.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/service-manager/src/main/java/org/commonjava/j2ee/services/ServiceManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ServiceManager.java 23 Mar 2004 14:58:58 -0000 1.1 +++ ServiceManager.java 8 Apr 2004 15:19:35 -0000 1.2 @@ -1,45 +1,27 @@ -/* Created on Mar 22, 2004 */ +/* + * Created on Apr 8, 2004 + * + */ package org.commonjava.j2ee.services; import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; import org.commonjava.config.snapin.SnapInLoaderException; -import org.commonjava.j2ee.services.ServiceLocator; -/** - * @author jdcasey +//TODO: Add JavaDoc to ServiceManager in commonjava-enterprise-services! +/** + * + * @ + * */ -public final class ServiceManager extends AbstractManager{ - +public interface ServiceManager { public static final String STANDARD_SVC_JNDI_CONFIG_NAME = "services"; - - /** - * - */ - public ServiceManager() { - setJndiConfigName(STANDARD_SVC_JNDI_CONFIG_NAME); - } - - public ServiceManager(ServiceLocator locator){ - super(locator); - setJndiConfigName(STANDARD_SVC_JNDI_CONFIG_NAME); - } /** Retrieve the JNDI configuration for Service lookups, then lookup the specified * jndi binding and return a service object, cast to the specified class. * @param jndiName The JNDI binding * @param castTo The class to cast the lookup result to. */ - public Object getService(String jndiName, Class castTo) - throws NamingException, SnapInLoaderException - { - Object result = getLocator().lookup(getJndiConfigName(), jndiName); - if(result != null && !castTo.isInstance(result)){ - result = PortableRemoteObject.narrow(result, castTo); - } - - return result; - } - -} + public abstract Object getService(String jndiName, Class castTo) + throws NamingException, SnapInLoaderException; +} \ No newline at end of file |
|
From: John C. <joh...@co...> - 2004-04-08 15:32:44
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/ejb-manager/src/main/java/org/commonjava/j2ee/services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1684/projects/ejb-manager/src/main/java/org/commonjava/j2ee/services Modified Files: EJBManager.java Added Files: DefaultEJBManager.java Log Message: refactored to provide an interface and default impl for each manager type, instead of merely a manager concrete impl. This will allow for easier mocking. --- NEW FILE: DefaultEJBManager.java --- /* Created on Mar 22, 2004 */ package org.commonjava.j2ee.services; import javax.naming.NamingException; import javax.rmi.PortableRemoteObject; import org.commonjava.config.snapin.SnapInLoaderException; import org.commonjava.j2ee.services.ServiceLocator; /** * @author jdcasey */ public final class DefaultEJBManager extends AbstractManager implements EJBManager{ /** * */ public DefaultEJBManager() { setJndiConfigName(STANDARD_EJB_JNDI_CONFIG_NAME); } public DefaultEJBManager(ServiceLocator locator){ super(locator); setJndiConfigName(STANDARD_EJB_JNDI_CONFIG_NAME); } /** Retrieve the JNDI configuration for EJB lookups, then lookup the specified * jndi binding and return an EJB home interface, cast to the specified class. * @param jndiName The JNDI binding * @param castTo The class to cast the lookup result to. */ public Object getEjbHome(String jndiName, Class castTo) throws NamingException, SnapInLoaderException { Object result = getLocator().lookup(getJndiConfigName(), jndiName); if(result != null && !castTo.isInstance(result)){ result = PortableRemoteObject.narrow(result, castTo); } return result; } } Index: EJBManager.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/ejb-manager/src/main/java/org/commonjava/j2ee/services/EJBManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EJBManager.java 23 Mar 2004 14:58:58 -0000 1.1 +++ EJBManager.java 8 Apr 2004 15:19:35 -0000 1.2 @@ -1,45 +1,27 @@ -/* Created on Mar 22, 2004 */ +/* + * Created on Apr 8, 2004 + * + */ package org.commonjava.j2ee.services; import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; import org.commonjava.config.snapin.SnapInLoaderException; -import org.commonjava.j2ee.services.ServiceLocator; -/** - * @author jdcasey +//TODO: Add JavaDoc to EJBManager in commonjava-enterprise-services! +/** + * + * @ + * */ -public final class EJBManager extends AbstractManager{ - +public interface EJBManager { public static final String STANDARD_EJB_JNDI_CONFIG_NAME = "ejb"; - - /** - * - */ - public EJBManager() { - setJndiConfigName(STANDARD_EJB_JNDI_CONFIG_NAME); - } - - public EJBManager(ServiceLocator locator){ - super(locator); - setJndiConfigName(STANDARD_EJB_JNDI_CONFIG_NAME); - } /** Retrieve the JNDI configuration for EJB lookups, then lookup the specified * jndi binding and return an EJB home interface, cast to the specified class. * @param jndiName The JNDI binding * @param castTo The class to cast the lookup result to. */ - public Object getEjbHome(String jndiName, Class castTo) - throws NamingException, SnapInLoaderException - { - Object result = getLocator().lookup(getJndiConfigName(), jndiName); - if(result != null && !castTo.isInstance(result)){ - result = PortableRemoteObject.narrow(result, castTo); - } - - return result; - } - -} + public abstract Object getEjbHome(String jndiName, Class castTo) + throws NamingException, SnapInLoaderException; +} \ No newline at end of file |
|
From: John C. <joh...@co...> - 2004-04-08 15:32:43
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/ejb-manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1684/projects/ejb-manager Modified Files: project.xml Log Message: refactored to provide an interface and default impl for each manager type, instead of merely a manager concrete impl. This will allow for easier mocking. Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/projects/ejb-manager/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.xml 23 Mar 2004 14:58:52 -0000 1.1 +++ project.xml 8 Apr 2004 15:19:34 -0000 1.2 @@ -32,6 +32,12 @@ </description> <dependencies> + <dependency> + <groupId>commonjava</groupId> + <artifactId>commonjava-es-core</artifactId> + <version>2.2</version> + </dependency> + &core-deps; <dependency> <groupId>ejb</groupId> |
|
From: John C. <joh...@co...> - 2004-03-27 04:35:40
|
Update of /cvsroot/commonjava/other-projects/marmalade/src/test/java/org/marmalade/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7841/src/test/java/org/marmalade/util Added Files: ScopedMapTest.java Log Message: added test for ScopedMap (it works!) and added OGNL implementation of ExpressionEvaluator (not tested yet). --- NEW FILE: ScopedMapTest.java --- /* Created on Mar 26, 2004 */ package org.marmalade.util; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Set; import junit.framework.TestCase; public class ScopedMapTest extends TestCase { public ScopedMapTest(String arg0) { super(arg0); } public static void main(String[] args) { junit.textui.TestRunner.run(ScopedMapTest.class); } protected void setUp() throws Exception { super.setUp(); } public void testConstruct() { System.out.println("testConstruct"); ScopedMap map = new ScopedMap(); assertTrue("Empty constructor should result in empty map.", map.isEmpty()); } public void testConstructWithMap() { System.out.println("testConstructWithMap"); Map base = new HashMap(); base.put("test", "testVal"); base.put("test2", "testVal2"); ScopedMap map = new ScopedMap(base); assertFalse("Constructor with map should result in non-empty map.", map.isEmpty()); assertEquals("Base map contains value for \'test\', scoped map should also.", "testVal", map.get("test")); base.remove("test"); assertNotNull("Removal from map used as constructor's parameter should NOT affect map.", map.get("test")); } public void testSize() { System.out.println("testSize"); Map base = new HashMap(); base.put("test", "testVal"); base.put("test2", "testVal2"); ScopedMap map = new ScopedMap(base); assertEquals("Scoped map size should be 2.", 2, map.size()); map.put("test3", "testVal3"); assertEquals("After addition scoped map size should be 3.", 3, map.size()); } public void testClear() { System.out.println("testClear"); Map base = new HashMap(); base.put("test", "testVal"); base.put("test2", "testVal2"); ScopedMap map = new ScopedMap(base); map.clear(); assertEquals("After clear, scoped map size should still be 2.", 2, map.size()); map.put("test3", "testVal3"); assertEquals("After addition scoped map size should be 3.", 3, map.size()); map.clear(); assertEquals("After addition and clear, scoped map size should be 2.", 2, map.size()); } public void testIsEmpty() { System.out.println("testIsEmpty"); Map base = new HashMap(); base.put("test", "testVal"); base.put("test2", "testVal2"); ScopedMap map = new ScopedMap(base); assertFalse("Scoped map with non-empty base should not be empty.", map.isEmpty()); map.clear(); assertFalse("After clear, scoped map with non-empty base should not be empty.", map.isEmpty()); ScopedMap map2 = new ScopedMap(); assertTrue("Scoped map with empty base should be empty.", map2.isEmpty()); } public void testContainsKey() { System.out.println("testContainsKey"); Map base = new HashMap(); base.put("test", "testVal"); ScopedMap map = new ScopedMap(base); assertTrue("Scoped map with non-empty base should contain key \'test\'.", map.containsKey("test")); ScopedMap map2 = new ScopedMap(); assertFalse("Scoped map with empty base should NOT contain key \'test\'.", map2.containsKey("test")); map.put("test", "testVal"); assertFalse("After put, scoped map with empty base should contain key \'test\'.", map2.containsKey("test")); } public void testContainsValue() { System.out.println("testContainsValue"); Map base = new HashMap(); base.put("test", "testVal"); ScopedMap map = new ScopedMap(base); assertTrue("Scoped map with non-empty base should contain value \'testVal\'.", map.containsValue("testVal")); ScopedMap map2 = new ScopedMap(); assertFalse("Scoped map with empty base should NOT contain value \'testVal\'.", map2.containsValue("testVal")); map2.put("test", "testVal"); assertTrue("After put, scoped map with empty base should contain value \'testVal\'.", map2.containsValue("testVal")); } public void testValues() { System.out.println("testValues"); Map base = new HashMap(); base.put("test", "testVal"); ScopedMap map = new ScopedMap(base); Collection coll = map.values(); assertTrue("Values from scoped map with non-empty base should contain \'testVal\'.", coll.contains("testVal")); coll.remove("testVal"); assertTrue("After collection remove, map should still contain value \'testVal\'.", map.containsValue("testVal")); ScopedMap map2 = new ScopedMap(); Collection coll2 = map2.values(); assertFalse("Values from scoped map with empty base should NOT contain \'testVal\'.", coll2.contains("testVal")); map2.put("test", "testVal"); assertTrue("After put, values from scoped map with empty base should contain \'testVal\'.", coll2.contains("testVal")); coll2.remove("testVal"); assertFalse("After collection remove, map should NOT contain value \'testVal\'.", map2.containsValue("testVal")); try{ coll2.add("testVal3"); fail("Add to values from scoped map should result in UnsupportedOperationException."); } catch(UnsupportedOperationException e){ } } public void testPutAll() { System.out.println("testEntrySet"); Map base = new HashMap(); base.put("test", "testVal"); ScopedMap map = new ScopedMap(base); assertEquals("ScopedMap with base should be of size 1", 1, map.size()); Map adds = new HashMap(); adds.put("test", "testVal4"); adds.put("test2", "testVal2"); adds.put("test3", "testVal3"); map.putAll(adds); assertEquals("ScopedMap with base should be of size 3 after putAll.", 3, map.size()); assertEquals("ScopedMap value mapped to \'test\' should be testVal.", "testVal", map.get("test")); ScopedMap map2 = new ScopedMap(); assertEquals("ScopedMap without base should be of size 0", 0, map2.size()); map2.put("test", "testVal"); assertEquals("After put, ScopedMap without Base should have mapped value for \'test\' of \'testVal\'", "testVal", map2.get("test")); Map adds2 = new HashMap(); adds2.put("test", "testVal4"); adds2.put("test2", "testVal2"); adds2.put("test3", "testVal3"); map2.putAll(adds2); assertEquals("ScopedMap without base should be of size 3 after putAll.", 3, map2.size()); assertEquals("ScopedMap value mapped to \'test\' should be testVal4.", "testVal4", map2.get("test")); } public void testEntrySet() { System.out.println("testEntrySet"); Map base = new HashMap(); base.put("test", "testVal"); ScopedMap map = new ScopedMap(base); Set coll = map.entrySet(); assertEquals("EntrySet from scoped map with non-empty base should be of size 1.", 1, coll.size()); Iterator it = coll.iterator(); Map.Entry entry = (Map.Entry)it.next(); assertEquals("Entry key should equal \'test\'", "test", entry.getKey()); it.remove(); assertEquals("After iterator remove, map should still be of size 1.", 1, map.size()); ScopedMap map2 = new ScopedMap(); Set coll2 = map2.entrySet(); assertEquals("EntrySet from scoped map with empty base should be of size 0.", 0, coll2.size()); map2.put("test", "testVal"); assertEquals("After put, entrySet from scoped map with empty base should be of size 1.", 1, coll2.size()); Iterator it2 = coll2.iterator(); Map.Entry entry2 = (Map.Entry)it2.next(); assertEquals("Entry key should equal \'test\'", "test", entry2.getKey()); it2.remove(); assertEquals("After iterator remove, map should be of size 0.", 0, map2.size()); try{ coll2.add(new DummyMapEntry()); fail("Add to entrySet from scoped map should result in UnsupportedOperationException."); } catch(UnsupportedOperationException e){ } } public void testKeySet() { System.out.println("testKeySet"); Map base = new HashMap(); base.put("test", "testVal"); ScopedMap map = new ScopedMap(base); Set coll = map.keySet(); assertTrue("KeySet from scoped map with non-empty base should contain \'test\'.", coll.contains("test")); coll.remove("test"); assertTrue("After set remove, map should still contain value \'test\'.", map.containsKey("test")); ScopedMap map2 = new ScopedMap(); Set coll2 = map2.keySet(); assertFalse("KeySet from scoped map with empty base should NOT contain \'test\'.", coll2.contains("test")); map2.put("test", "testVal"); assertTrue("After put, keySet from scoped map with empty base should contain \'test\'.", coll2.contains("test")); coll2.remove("test"); assertFalse("After set remove, map should NOT contain value \'test\'.", map2.containsValue("test")); try{ coll2.add("test3"); fail("Add to keySet from scoped map should result in UnsupportedOperationException."); } catch(UnsupportedOperationException e){ } } public void testGet() { System.out.println("testGet"); Map base = new HashMap(); base.put("test", "testVal"); ScopedMap map = new ScopedMap(base); assertEquals("Get with ScopedMap having base for key \'test\' should be \'testVal\'", "testVal", map.get("test")); map.put("test", "testVal4"); assertEquals("Get with ScopedMap having base for key \'test\' should be \'testVal\'", "testVal", map.get("test")); ScopedMap map2 = new ScopedMap(); assertNull("Get with ScopedMap for key \'test\' should be null", map2.get("test")); map2.put("test", "testVal"); assertEquals("Get with ScopedMap for key \'test\' should be \'testVal\'", "testVal", map2.get("test")); } public void testRemove() { System.out.println("testRemove"); Map base = new HashMap(); base.put("test", "testVal"); ScopedMap map = new ScopedMap(base); assertEquals("Get with ScopedMap having base for key \'test\' should be \'testVal\'", "testVal", map.get("test")); map.remove("test"); assertEquals("Get with ScopedMap having base for key \'test\' should be \'testVal\'", "testVal", map.get("test")); ScopedMap map2 = new ScopedMap(); map2.put("test", "testVal"); assertEquals("Get with ScopedMap for key \'test\' should be \'testVal\'", "testVal", map2.get("test")); map2.remove("test"); assertNull("Get with ScopedMap for key \'test\' should be null", map2.get("test")); } public void testPut() { System.out.println("testPut"); Map base = new HashMap(); base.put("test", "testVal"); ScopedMap map = new ScopedMap(base); assertEquals("Get with ScopedMap having base for key \'test\' should be \'testVal\'", "testVal", map.get("test")); map.put("test", "testVal4"); assertEquals("Get with ScopedMap having base for key \'test\' should be \'testVal\'", "testVal", map.get("test")); ScopedMap map2 = new ScopedMap(); assertNull("Get with ScopedMap for key \'test\' should be null", map2.get("test")); map2.put("test", "testVal"); assertEquals("Get with ScopedMap for key \'test\' should be \'testVal\'", "testVal", map2.get("test")); } private static class DummyMapEntry implements Map.Entry{ DummyMapEntry(){} public Object getKey() { return null; } public Object getValue() { return null; } public Object setValue(Object value) { return null; } } } |
|
From: John C. <joh...@co...> - 2004-03-27 04:35:39
|
Update of /cvsroot/commonjava/other-projects/marmalade/subprojects/ognl-el/src/main/java/org/marmalade/el/ognl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7841/subprojects/ognl-el/src/main/java/org/marmalade/el/ognl Added Files: OgnlExpressionEvaluator.java Log Message: added test for ScopedMap (it works!) and added OGNL implementation of ExpressionEvaluator (not tested yet). --- NEW FILE: OgnlExpressionEvaluator.java --- /* Created on Mar 26, 2004 */ package org.marmalade.el.ognl; import java.util.Map; import org.marmalade.el.ExpressionEvaluationException; import org.marmalade.el.ExpressionEvaluator; import ognl.Ognl; import ognl.OgnlException; /** * @author jdcasey */ public class OgnlExpressionEvaluator implements ExpressionEvaluator { /** * */ public OgnlExpressionEvaluator() { } /** Evaluate the expression as an OGNL expression, using the specified map for context. * @see org.marmalade.el.ExpressionEvaluator#evaluate(java.lang.String, java.util.Map) */ public Object evaluate(String expression, Map context) throws ExpressionEvaluationException { try { return Ognl.getValue(expression, context, (Object)null); } catch (OgnlException e) { throw new ExpressionEvaluationException(expression, e); } } } |
|
From: John C. <joh...@co...> - 2004-03-27 04:35:39
|
Update of /cvsroot/commonjava/other-projects/marmalade/src/main/java/org/marmalade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7841/src/main/java/org/marmalade Modified Files: MarmaladeFactory.java Log Message: added test for ScopedMap (it works!) and added OGNL implementation of ExpressionEvaluator (not tested yet). Index: MarmaladeFactory.java =================================================================== RCS file: /cvsroot/commonjava/other-projects/marmalade/src/main/java/org/marmalade/MarmaladeFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MarmaladeFactory.java 26 Mar 2004 05:13:35 -0000 1.1 +++ MarmaladeFactory.java 27 Mar 2004 04:24:34 -0000 1.2 @@ -1,7 +1,14 @@ /* Created on Mar 24, 2004 */ package org.marmalade; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.lang.reflect.UndeclaredThrowableException; +import java.util.HashMap; import java.util.Map; +import java.util.WeakHashMap; import org.codehaus.tagalog.Attributes; import org.commonjava.reflection.FinderException; @@ -17,39 +24,81 @@ private static final String DEFAULT_EL_TYPE = "ognl"; - private static final String EL_LOCK = "EL-LOCK".intern(); - - private static ExpressionEvaluator el; + private static Map evaluators = new WeakHashMap(); /** Factory; deny construction. */ private MarmaladeFactory() { } + /** Return the default expression evaluator implementation. + */ public static ExpressionEvaluator getDefaultExpressionEvaluator() throws ConfigurationException { return getExpressionEvaluator(DEFAULT_EL_TYPE); } + /** Return the expression evaluator implementation for the specified EL type. + */ public static ExpressionEvaluator getExpressionEvaluator(String type) throws ConfigurationException { - synchronized(EL_LOCK){ - if(el == null){ - try { - el = (ExpressionEvaluator)ImplFinder.findImplementation( - ExpressionEvaluator.class, new Object[]{} - ); - } - catch (FinderException e) { + // lock only for the specified type of EL...let everything else happen. + synchronized(type.intern()){ + ExpressionEvaluator evaluator = (ExpressionEvaluator)evaluators.get(type); + if(evaluator == null){ + String elResource = "META-INF/el/" + type; + ClassLoader cloader = MarmaladeFactory.class.getClassLoader(); + + InputStream res = cloader.getResourceAsStream(elResource); + if(res == null){ throw new ConfigurationException( - "Error retrieving ExpressionEvaluator implementation.", e + "No ExpressionEvaluator implementation found for EL type: " + type ); } + else{ + String className = null; + + try{ + BufferedReader in = new BufferedReader(new InputStreamReader(res)); + in.readLine(); + in.close(); + } + catch(IOException e){ + throw new ConfigurationException( + "Error reading Expression Evaluator implementation class name for type: \'" + + type + "\' from \'" + elResource + "\'.", + e + ); + } + + try { + Class elClass = cloader.loadClass(className); + evaluator = (ExpressionEvaluator)elClass.newInstance(); + evaluators.put(type, evaluator); + } + catch (ClassNotFoundException e) { + throw new ConfigurationException( + "Expression evaluator class: \'" + className + "\' for type: \'" + + type + "\' not found.", + e + ); + } + catch (InstantiationException e) { + throw new ConfigurationException("Error instantiating expression evaluator.", e); + } + catch (IllegalAccessException e) { + throw new ConfigurationException("Error instantiating expression evaluator.", e); + } + catch(UndeclaredThrowableException e){ + Throwable t = e.getUndeclaredThrowable(); + throw new ConfigurationException("Error instantiating expression evaluator.", t); + } + } } - return el; + return evaluator; } } |
