commonjava-developer Mailing List for CommonJava Open Component Project (Page 11)
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: <joh...@co...> - 2004-02-20 21:25:32
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-diff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11430 Modified Files: .project project.xml .classpath Added Files: project.properties maven.xml Log Message: corrected versioning differences...everything is up to date. --- NEW FILE: project.properties --- maven.username=maven 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 maven.multiproject.basedir=.. maven.multiproject.includes=commonjava-*/project.xml maven.multiproject.excludes=commonjava-site/project.xml maven.multiproject.aggregateDir=projects/ maven.compile.source=1.4 maven.compile.target=1.4 #maven.junit.fork=true maven.junit.usefile=${basedir}/junit.out --- NEW FILE: maven.xml --- <?xml version="1.0" encoding="UTF-8"?> <project xmlns:c="jelly:core"> <preGoal name="test:test"> <c:invokeStatic className="java.lang.System" method="setProperty"> <c:arg value="diff-test-src"/> <c:arg value="${basedir}/src/test"/> </c:invokeStatic> </preGoal> </project> Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-diff/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .project 17 Jan 2004 04:12:47 -0000 1.2 +++ .project 20 Feb 2004 21:14:07 -0000 1.3 @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> - <name>commonjava-diff</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> + <name>commonjava-diff</name> + <comment>Binary Diff is CommonJava's implementation of the binary diff algorithm. It parses an inbound ByteBuffer into a map of byte occurrences, and then finds the best chunk delimiter based on minimum standard deviation and minimum average of the chunk length when divided by the candidate chunk delimiter. Then, using this character, it chunks each ByteBuffer (original and new), and proceeds much like any other diff algorithm. When a chunk is in the original but not the new, that represents deleted information. When the chunk is in the new but not the original, that is added information. These operations (adds and deletes) are then organized so that the engine can reapply them to the new stream to retrieve the old stream. It could use some optimization, but it works and we're pretty happy about that.</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-diff/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- project.xml 18 Feb 2004 06:11:37 -0000 1.5 +++ project.xml 20 Feb 2004 21:14:08 -0000 1.6 @@ -5,7 +5,7 @@ <id>commonjava-diff</id> <name>Binary Diff</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> @@ -29,13 +29,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-lang</artifactId> - <version>2.0</version> - </dependency> - - <dependency> - <groupId>commonjava</groupId> - <artifactId>commonjava-codec</artifactId> - <version>2.0</version> + <version>2.0-1</version> </dependency> <dependency> @@ -53,7 +47,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-util</artifactId> - <version>2.0-2</version> + <version>2.0-3</version> </dependency> <dependency> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-diff/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .classpath 17 Jan 2004 04:12:47 -0000 1.1 +++ .classpath 20 Feb 2004 21:14:08 -0000 1.2 @@ -1,14 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <classpathentry kind="src" path="src/java"/> - <classpathentry kind="src" path="src/test"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-codec-2.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0-2.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-math-2.0.jar"/> - <classpathentry sourcepath="ECLIPSE_HOME/workspace/commonjava-lang/src/java" kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-lang-2.0.jar"/> - <classpathentry sourcepath="ECLIPSE_HOME/workspace/commonjava-console/src/java" kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-console-2.0.jar"/> - <classpathentry sourcepath="JUNIT_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/> - <classpathentry kind="output" path="target/classes"/> -</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-lang-2.0-1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-console-2.0.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-math-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.3.jar"> + </classpathentry> + <classpathentry kind="output" path="target\classes"> + </classpathentry> +</classpath> \ No newline at end of file |
Update of /cvsroot/commonjava/commonjava-projects/commonjava-diff/src/java/org/commonjava/diff/ser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11430/src/java/org/commonjava/diff/ser Removed Files: DiffOperationElements.java XmlDiffFormatter.java XmlDiffParser.java XmlDiffOpParser.java Log Message: corrected versioning differences...everything is up to date. --- DiffOperationElements.java DELETED --- --- XmlDiffFormatter.java DELETED --- --- XmlDiffParser.java DELETED --- --- XmlDiffOpParser.java DELETED --- |
|
From: <joh...@co...> - 2004-02-20 21:25:19
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-cmdctl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11366 Modified Files: .classpath .project Log Message: corrected versioning differences...everything is up to date. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-cmdctl/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .classpath 15 Dec 2003 01:50:02 -0000 1.2 +++ .classpath 20 Feb 2004 21:13:57 -0000 1.3 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/java"> + <classpathentry kind="src" path="src\java"> </classpathentry> <classpathentry kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB" sourcepath="JRE_SRC"> </classpathentry> @@ -9,6 +9,6 @@ </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-lang-2.0.jar"> </classpathentry> - <classpathentry kind="output" path="target/classes"> + <classpathentry kind="output" path="target\classes"> </classpathentry> </classpath> \ No newline at end of file Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-cmdctl/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .project 15 Dec 2003 01:50:02 -0000 1.2 +++ .project 20 Feb 2004 21:13:57 -0000 1.3 @@ -2,8 +2,7 @@ <projectDescription> <name>commonjava-cmdctl</name> - <comment> - </comment> + <comment>Command & Control is a project intended to allow convenient control over the runtime environment. Currently, the only implementation in this project is a task-oriented manager which is used as a JVM shutdown hook. Essentially, the user only has to implement ShutdownTask (only the method execute()), and then add an instance of this implementation to the ShutdownTaskManager via ShutdownTaskManager.addTask(). On shutdown, the task manager is executed by the JVM, which triggers a chain of events. First, the task manager locks itself, so that no new shutdown tasks may be added. Then, it iterates through each task associated with it, executing each as it encounters it.</comment> <projects> </projects> <buildSpec> |
|
From: <joh...@co...> - 2004-02-20 21:25:10
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-security In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11318 Modified Files: .classpath Log Message: corrected versioning differences...everything is up to date. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-security/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .classpath 18 Sep 2003 06:12:14 -0000 1.1 +++ .classpath 20 Feb 2004 21:13:45 -0000 1.2 @@ -1,11 +1,7 @@ <?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 kind="src" path="src\java"> </classpathentry> <classpathentry kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB" sourcepath="JRE_SRC"> </classpathentry> @@ -17,6 +13,6 @@ </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.2.jar"> </classpathentry> - <classpathentry kind="output" path="target/classes"> + <classpathentry kind="output" path="target\classes"> </classpathentry> </classpath> \ No newline at end of file |
|
From: <joh...@co...> - 2004-02-19 23:27:52
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26482 Modified Files: .project .classpath project.xml Log Message: added new classes for managing snap-ins via JBoss service. Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .project 18 Feb 2004 06:11:01 -0000 1.2 +++ .project 19 Feb 2004 23:17:07 -0000 1.3 @@ -1,24 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> - <name>commonjava-config</name> - <comment> - </comment> - <projects> - <project>commonjava-codec</project> - <project>commonjava-io</project> - <project>commonjava-lang</project> - <project>commonjava-opl</project> - <project>commonjava-reflection</project> - <project>commonjava-util</project> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> + <name>commonjava-config</name> + <comment>The Configurations project is intended to provide various ways of configuring an application, beyond mere properties files. These methods are mainly based on XML configuration files, although one notable exception to this is the org.commonjava.config.Configuration class, which can have any number of format/parse codecs for it. XML and properties file format are supported natively. Beyond this, the next generation of configuration involves building and storing complex configuration objects, which can then be referenced by an application via a common configuration repository. These objects are called snap-ins, and are managed by the SnapInContainer/SnapInContainerLoader hierarchy, in org.commonjava.config.snapin. The snap-in package was originally intended to be coupled with OPL (another CommonJava project, for parsing XML into objects), but technically can be used with any object parser. The SnapInContainerLoader implementation may drive the parsing process, as in the case of GenericSnapInContainerLoader, but doesn't have to. The only requirement of the snap-in functionality is that it serve as a commonly-accessible repository for configuration objects, which are each keyed by a unique id String (usually the class name of the configuration object, to avoid namespacing issues). Then, the application can use SnapInContainerLoader.getSnapInContainer().getSnapIn(UID) to retrieve the configuration object it desires. Paired with the namespace-awareness of OPL, the snap-in framework can support and consolidate an incredible range of configuration information within easy reach of any application component. No more passing configuration objects as parameters to level after level of nested constructors. No more custom singletons serving configuration information in non-standard ways. No more x.getIntegerProperty("some.unique.key"), paired with management of the unique keys via constants class. This is better. Trust us.</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config/.classpath,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- .classpath 18 Feb 2004 06:11:01 -0000 1.5 +++ .classpath 19 Feb 2004 23:17:08 -0000 1.6 @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/java"/> + <classpathentry kind="src" path="src/test"/> <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-lang-2.0-1.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-reflection-2.0.jar" sourcepath="WORKSPACE/commonjava-reflection/src/java"/> + <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/jboss/jars/jboss-system-3.2.3.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jnp-client-3.2.3.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jboss-jmx-3.2.3.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jboss-common-3.2.3.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jboss-3.2.3.jar"/> - <classpathentry kind="src" path="/commonjava-util"/> - <classpathentry kind="src" path="/commonjava-reflection"/> - <classpathentry kind="src" path="/commonjava-opl"/> - <classpathentry kind="src" path="/commonjava-lang"/> - <classpathentry kind="src" path="/commonjava-io"/> - <classpathentry kind="src" path="/commonjava-codec"/> + <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- project.xml 18 Feb 2004 06:11:01 -0000 1.3 +++ project.xml 19 Feb 2004 23:17:08 -0000 1.4 @@ -41,14 +41,14 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-lang</artifactId> - <version>2.0</version> + <version>2.0-1</version> <url>http://www.commonjava.org</url> </dependency> <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-opl</artifactId> - <version>2.1-4</version> + <version>2.1-5</version> <url>http://www.commonjava.org</url> </dependency> @@ -69,7 +69,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-util</artifactId> - <version>2.0-2</version> + <version>2.0-3</version> <url>http://www.commonjava.org</url> </dependency> |
|
From: <joh...@co...> - 2004-02-19 23:27:48
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-config/projects/jboss-config-service In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26482/projects/jboss-config-service Modified Files: project.properties project.xml Added Files: maven.xml Log Message: added new classes for managing snap-ins via JBoss service. --- NEW FILE: maven.xml --- <?xml version="1.0" encoding="UTF-8"?> <project default="jar:jar" xmlns:c="jelly:core" xmlns:ant="jelly:ant"> <goal name="sar"> <attain> <attainGoal name="jar:jar"/> <ant:copy file="${maven.build.dir}/${maven.final.name}.jar" tofile="${maven.build.dir}/${maven.final.name}.sar"/> </attain> </goal> <preGoal name="jar:jar"> <ant:copy todir="${maven.build.dest}"> <ant:fileset dir="${basedir}"> <ant:include name="SomeNonExistentFile"/> </ant:fileset> <c:forEach var="lib" items="${pom.artifacts}"> <c:set var="dep" value="${lib.dependency}"/> <c:if test="${dep.getProperty('jar.bundle') == 'true'}"> <ant:echo>Bundling ${dep.id} - ${dep.artifact}</ant:echo> <ant:fileset dir="${lib.file.parent}"> <ant:include name="${lib.file.name}"/> </ant:fileset> </c:if> </c:forEach> </ant:copy> </preGoal> <preGoal name="eclipse"> <attainGoal name="java:compile"/> </preGoal> <!-- TASKS: | 1. Create generated-source directory and copy all existing source to it. | 2. Generate full java source via XDoclet. | 3. Backup the maven.src.dir variable to maven.oldsrc.dir. | 4. Re-init the sourcesPresent, maven.compile.src.set, etc. |--> <preGoal name="java:compile"> <c:if test="${empty(maven.gensrc.dir)}"> <c:set var="maven.gensrc.dir" value="${maven.build.dir}/generated-source"/> </c:if> <ant:taskdef classname="xdoclet.modules.jmx.JMXDocletTask" name="jmxdoclet"> <ant:classpath> <ant:path refid="maven.dependency.classpath" /> </ant:classpath> </ant:taskdef> <ant:mkdir dir="${maven.gensrc.dir}"/> <ant:copy todir="${maven.gensrc.dir}"> <ant:fileset dir="${pom.build.sourceDirectory}"/> </ant:copy> <ant:echo>Starting JMXDoclet...</ant:echo> <ant:jmxdoclet destDir="${maven.gensrc.dir}" verbose="true"> <ant:fileset dir="${maven.gensrc.dir}"/> <ant:echo>Test</ant:echo> <ant:mbeaninterface/> </ant:jmxdoclet> <ant:echo>...Finished JMXDoclet</ant:echo> <c:set var="maven.oldsrc.dir" value="${maven.src.dir}"/> <c:set var="maven.src.dir" value="${maven.gensrc.dir}"/> <c:set target="${pom.build}" property="sourceDirectory" value="${maven.src.dir}"/> <ant:echo>maven.src.dir is now ${maven.src.dir}</ant:echo> <ant:echo>pom.build.sourceDirectory is now ${pom.build.sourceDirectory}</ant:echo> <!-- Swiped from: --> <!-- ================================================================== --> <!-- D R I V E R I N I T I A L I Z A T I O N --> <!-- ================================================================== --> <!-- All things we want to provide to all plugins, or processes we --> <!-- performed before every build are declared/defined here. --> <!-- ================================================================== --> <c:if test="${!empty(maven.src.dir)}"> <ant:available property="sourcesPresent" file="${maven.src.dir}"/> </c:if> <ant:path id="maven-classpath"> <ant:fileset dir="${maven.home}/lib"/> </ant:path> <c:if test="${sourcesPresent == 'true'}"> <!-- | FIXME: It would be nice for other plugins to have the source available | as a fileset |--> <ant:path id="maven.compile.src.set"> <ant:pathelement location="${maven.src.dir}"/> </ant:path> </c:if> </preGoal> </project> Index: project.properties =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config/projects/jboss-config-service/project.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.properties 18 Feb 2004 06:11:01 -0000 1.1 +++ project.properties 19 Feb 2004 23:17:07 -0000 1.2 @@ -3,3 +3,4 @@ maven.repo.central=www.commonjava.org maven.repo.central.directory=/usr/local/maven-repository +maven.jar.manifest.classpath.add=true Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config/projects/jboss-config-service/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.xml 18 Feb 2004 06:11:01 -0000 1.1 +++ project.xml 19 Feb 2004 23:17:07 -0000 1.2 @@ -16,16 +16,13 @@ <dependencies> <dependency> <groupId>commonjava</groupId> - <artifactId>commonjava-enterprise-services</artifactId> - <version>2.1-1</version> - <url>http://www.commonjava.org</url> - </dependency> - - <dependency> - <groupId>commonjava</groupId> <artifactId>commonjava-config</artifactId> <version>2.1-1</version> <url>http://www.commonjava.org</url> + <properties> + <jar.bundle>true</jar.bundle> + <jar.manifest.classpath>true</jar.manifest.classpath> + </properties> </dependency> <dependency> @@ -63,6 +60,10 @@ <artifactId>commonjava-lang</artifactId> <version>2.0</version> <url>http://www.commonjava.org</url> + <properties> + <jar.bundle>true</jar.bundle> + <jar.manifest.classpath>true</jar.manifest.classpath> + </properties> </dependency> <dependency> @@ -70,6 +71,10 @@ <artifactId>commonjava-opl</artifactId> <version>2.1-4</version> <url>http://www.commonjava.org</url> + <properties> + <jar.bundle>true</jar.bundle> + <jar.manifest.classpath>true</jar.manifest.classpath> + </properties> </dependency> <dependency> @@ -77,6 +82,10 @@ <artifactId>commonjava-io</artifactId> <version>2.0</version> <url>http://www.commonjava.org</url> + <properties> + <jar.bundle>true</jar.bundle> + <jar.manifest.classpath>true</jar.manifest.classpath> + </properties> </dependency> <dependency> @@ -84,6 +93,10 @@ <artifactId>commonjava-reflection</artifactId> <version>2.0</version> <url>http://www.commonjava.org</url> + <properties> + <jar.bundle>true</jar.bundle> + <jar.manifest.classpath>true</jar.manifest.classpath> + </properties> </dependency> <dependency> @@ -91,6 +104,10 @@ <artifactId>commonjava-util</artifactId> <version>2.0-2</version> <url>http://www.commonjava.org</url> + <properties> + <jar.bundle>true</jar.bundle> + <jar.manifest.classpath>true</jar.manifest.classpath> + </properties> </dependency> <dependency> @@ -98,8 +115,43 @@ <artifactId>commons-logging</artifactId> <version>1.0.2</version> <url>http://jakarta.apache.org/commons/logging.html</url> + <properties> + <jar.bundle>true</jar.bundle> + <jar.manifest.classpath>true</jar.manifest.classpath> + </properties> </dependency> + <!-- following is for XDoclet --> + <dependency> + <groupId>xjavadoc</groupId> + <artifactId>xjavadoc</artifactId> + <version>1.0.2</version> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xdoclet</artifactId> + <version>1.2</version> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xdoclet-jmx-module</artifactId> + <version>1.2</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>2.1</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.2</version> + </dependency> + <!-- end of XDoclet dependencies --> </dependencies> <build> @@ -108,7 +160,7 @@ <sourceModification> <className>AlwaysPerformTheseModifications</className> <excludes> - <exclude>**/JBossSnapInServiceLoader.java</exclude> + <exclude>**/*Loader.java</exclude> </excludes> </sourceModification> </sourceModifications> @@ -132,6 +184,9 @@ <include>META-INF/**</include> </includes> </resource> + <resource> + <directory>${basedir}/src/config</directory> + </resource> </resources> </build> |
Update of /cvsroot/commonjava/commonjava-projects/commonjava-config/projects/jboss-config-service/src/java/org/commonjava/config/snapin/jboss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26482/projects/jboss-config-service/src/java/org/commonjava/config/snapin/jboss Added Files: SnapInService.java LocalSnapInServiceLoader.java SnapInServiceLoader.java SnapInServiceConstants.java Removed Files: JBossSnapInLocalSvcLoader.java SnapInServiceMBean.java JBossSnapInService.java JBossSnapInServiceConstants.java JBossSnapInServiceLoader.java Log Message: added new classes for managing snap-ins via JBoss service. --- NEW FILE: SnapInService.java --- /* Created on Feb 14, 2004 */ package org.commonjava.config.snapin.jboss; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.Name; import javax.naming.NameNotFoundException; import javax.naming.NamingException; import javax.naming.Reference; import javax.naming.StringRefAddr; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.commonjava.config.snapin.SnapInContainer; import org.commonjava.config.snapin.SnapInContainerLoader; import org.commonjava.config.snapin.SnapInLoaderException; import org.commonjava.opl.ParseException; import org.jboss.naming.NonSerializableFactory; import org.jboss.system.ServiceMBeanSupport; import org.w3c.dom.Element; import org.w3c.dom.NodeList; /** Service used to expose a snap-in container to the server via JNDI. * * @jmx.mbean description="Server-centric manager for configuration snap-ins" * name="jboss:type=Service,service=SnapInService" * extends="org.jboss.system.ServiceMBean" * * @author John Casey */ public final class SnapInService extends ServiceMBeanSupport implements SnapInServiceMBean{ private static final Log LOG = LogFactory.getLog(SnapInService.class); private SnapInContainer container; private Element configElement; private String configPath; /** * Return the configuration path to load snap-ins from. * @jmx:managed-attribute */ public synchronized String getConfigPath(){ return configPath; } /** Set the configuration path to use in loading the snap-ins. * @jmx.managed-attribute */ public synchronized void setConfigPath(String configPath) throws SnapInLoaderException, ParseException { this.configPath = configPath; if(configPath != null){ System.setProperty(SnapInContainerLoader.LOCATION_SYSPROP, configPath); } SnapInContainer container = loadContainer(); if (LOG.isInfoEnabled()) { LOG.info("SnapInManager's underlying container was reloaded from: " + configPath); } this.container = container; } /** * @jmx.managed-operation * @throws SnapInLoaderException * @throws ParseException */ public void reloadContainer() throws SnapInLoaderException, ParseException{ if (LOG.isInfoEnabled()) { LOG.info("Reloading SnapInManager's underlying container..."); } SnapInContainer container = loadContainer(); this.container = container; if (LOG.isInfoEnabled()) { LOG.info("...SnapInManager container reload complete."); } } /* (non-Javadoc) * @see org.jboss.system.ServiceMBeanSupport#startService() */ protected void startService() throws Exception { bind(); } /* (non-Javadoc) * @see org.jboss.system.ServiceMBeanSupport#stopService() */ protected void stopService() throws Exception { unbind(); // release container. Reload if re-bound. container = null; } private void bind() throws NamingException, SnapInLoaderException, ParseException { this.container = loadContainer(); String bindName = SnapInServiceConstants.JNDI_NAME; NonSerializableFactory.bind(bindName, container); Context ctx = new InitialContext(); try{ Name n = ctx.getNameParser("").parse(bindName); while (n.size() > 1){ String ctxName = n.get(0); try{ ctx = (Context) ctx.lookup(ctxName); } catch (NameNotFoundException e){ ctx = ctx.createSubcontext(ctxName); } n = n.getSuffix(1); } // The helper class NonSerializableFactory uses address type nns, we go on to // use the helper class to bind the javax.mail.Session object in JNDI StringRefAddr addr = new StringRefAddr("nns", bindName); Reference ref = new Reference( SnapInContainer.class.getName(), addr, NonSerializableFactory.class.getName(), null ); ctx.bind(n.get(0), ref); } finally{ ctx.close(); } if (LOG.isInfoEnabled()) { LOG.info("Snap-In Service bound to " + bindName); } } private void unbind() throws NamingException, ParseException { String bindName = SnapInServiceConstants.JNDI_NAME; if (bindName != null) { InitialContext ctx = new InitialContext(); try{ ctx.unbind(bindName); } finally{ ctx.close(); } NonSerializableFactory.unbind(bindName); if (LOG.isInfoEnabled()) { LOG.info("Snap-In service '" + bindName + "' removed from JNDI"); } } } /** * */ private SnapInContainer loadContainer() throws SnapInLoaderException, ParseException { return SnapInContainerLoader.getSnapInContainer(); } } --- NEW FILE: LocalSnapInServiceLoader.java --- /* Created on Feb 14, 2004 */ package org.commonjava.config.snapin.jboss; import javax.naming.NamingException; import org.commonjava.config.snapin.SnapInContainer; import org.commonjava.config.snapin.SnapInContainerLoader; import org.commonjava.config.snapin.SnapInLoaderException; import org.commonjava.j2ee.services.ServiceLocator; import org.commonjava.j2ee.services.config.EnterpriseConfigurationException; /** * @author jdcasey */ public class LocalSnapInServiceLoader extends SnapInContainerLoader { public LocalSnapInServiceLoader(){} public SnapInContainer loadSnapInContainer() throws SnapInLoaderException { try { return (SnapInContainer)ServiceLocator.getLocalService( SnapInServiceConstants.JNDI_NAME, SnapInContainer.class ); } catch(NamingException e){ throw new SnapInLoaderException(e); } catch (EnterpriseConfigurationException e) { throw new SnapInLoaderException(e); } } } --- NEW FILE: SnapInServiceLoader.java --- /* Created on Feb 14, 2004 */ package org.commonjava.config.snapin.jboss; import javax.naming.NamingException; import org.commonjava.config.snapin.GenericSnapInContainerLoader; import org.commonjava.config.snapin.SnapInContainer; import org.commonjava.config.snapin.SnapInContainerLoader; import org.commonjava.config.snapin.SnapInLoaderException; import org.commonjava.config.snapin.StackedSnapInContainer; import org.commonjava.j2ee.services.ServiceLocator; import org.commonjava.j2ee.services.config.EnterpriseConfigurationException; /** * @author jdcasey */ public class SnapInServiceLoader extends SnapInContainerLoader { public SnapInServiceLoader(){} public SnapInContainer loadSnapInContainer() throws SnapInLoaderException { // We're using a pretty complex setup here. We'll stack the local configuration on top of // the proxied one from the JNDI lookup. This way, local settings can override remote ones. StackedSnapInContainer container = new StackedSnapInContainer(); // First, load the local configuration snap-ins. SnapInContainerLoader localLoader = GenericSnapInContainerLoader.getInstance(); SnapInContainer localContainer = localLoader.loadSnapInContainer(); container.prepend(localContainer); try { SnapInContainer remoteContainer = (SnapInContainer)ServiceLocator.getService( SnapInServiceConstants.JNDI_NAME, SnapInContainer.class ); container.append(remoteContainer); } catch (EnterpriseConfigurationException e) { throw new SnapInLoaderException(e); } catch(NamingException e){ throw new SnapInLoaderException(e); } return container; } } --- NEW FILE: SnapInServiceConstants.java --- /* Created on Feb 14, 2004 */ package org.commonjava.config.snapin.jboss; /** * @author jdcasey */ public final class SnapInServiceConstants { public static final String JNDI_NAME = "/services/SnapInService"; private SnapInServiceConstants() { } } --- JBossSnapInLocalSvcLoader.java DELETED --- --- SnapInServiceMBean.java DELETED --- --- JBossSnapInService.java DELETED --- --- JBossSnapInServiceConstants.java DELETED --- --- JBossSnapInServiceLoader.java DELETED --- |
|
From: <joh...@co...> - 2004-02-19 23:27:47
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-config/projects/jboss-config-service/src/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26482/projects/jboss-config-service/src/config Added Files: configuration.xml Log Message: added new classes for managing snap-ins via JBoss service. --- NEW FILE: configuration.xml --- <?xml version="1.0" encoding="UTF-8"?> <snapin-container xmlns="opl:generic-snapins"> </snapin-container> |
|
From: <joh...@co...> - 2004-02-19 23:26:50
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-config/projects/jboss-config-service/src/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26288/projects/jboss-config-service/src/config Log Message: Directory /cvsroot/commonjava/commonjava-projects/commonjava-config/projects/jboss-config-service/src/config added to the repository |
|
From: <joh...@co...> - 2004-02-19 14:30:29
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-util/src/java/org/commonjava/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2943/src/java/org/commonjava/util Modified Files: ThreadThrottle.java Log Message: flushed out most of the problems with ThreadThrottle. It should work properly now. Index: ThreadThrottle.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-util/src/java/org/commonjava/util/ThreadThrottle.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ThreadThrottle.java 18 Sep 2003 06:28:59 -0000 1.1 +++ ThreadThrottle.java 19 Feb 2004 14:20:06 -0000 1.2 @@ -53,6 +53,9 @@ this.maxPendingSize = maxPendingSize; this.maxRunningSize = maxRunningSize; this.defaultThreadWaitMillis = defaultThreadWaitMillis; + if(LOG.isDebugEnabled()){ + LOG.debug("maxPendingSize {" + maxPendingSize + "}; maxRunningSize {" + maxRunningSize + "}"); + } } /** Adjust the Pending thread limit. @@ -116,43 +119,15 @@ /** Wait for all threads throttled by this throttle are finished. * @param wait Per-thread timeout for the join operation. */ - public void joinAll(long wait){ - if(LOG.isDebugEnabled()){ - LOG.debug("Entering joinAll() with wait"); + public void joinAll(long wait) throws InterruptedException{ + if(LOG.isTraceEnabled()){ + LOG.trace("Entering joinAll() with wait"); } - while(pending.size() > 0 || running.size() > 0){ - Thread[] runningThreads = null; - - synchronized(runningLock){ - runningThreads = (Thread[])running.toArray(new Thread[running.size()]); - } - - if(runningThreads != null){ - for(int i=0, len=runningThreads.length; i<len; i++){ - if(runningThreads[i] != null){ - if(LOG.isDebugEnabled()){ - LOG.debug("joining thread: " + runningThreads[i].getName()); - } - - try{ - runningThreads[i].join(wait); - } - catch(InterruptedException ex){} - } - } - } - + if(pending.size() > 0 || running.size() > 0){ synchronized(runningLock){ - if(pending.size() > 0 && running.size() < 1){ - if(LOG.isDebugEnabled()){ - LOG.debug("waiting for idle threads to run."); - } - - try{ - runningLock.wait(wait); - } - catch(InterruptedException ex){} + while(running.size() > 0){ + runningLock.wait(wait); } } } @@ -160,43 +135,15 @@ /** Wait for all threads throttled by this throttle are finished. */ - public void joinAll(){ - if(LOG.isDebugEnabled()){ - LOG.debug("Entering joinAll()"); + public void joinAll() throws InterruptedException{ + if(LOG.isTraceEnabled()){ + LOG.trace("Entering joinAll()"); } - while(pending.size() > 0 || running.size() > 0){ - Thread[] runningThreads = null; - - synchronized(runningLock){ - runningThreads = (Thread[])running.toArray(new Thread[running.size()]); - } - - if(runningThreads != null){ - for(int i=0, len=runningThreads.length; i<len; i++){ - if(runningThreads[i] != null){ - if(LOG.isDebugEnabled()){ - LOG.debug("joining thread: " + runningThreads[i].getName()); - } - - try{ - runningThreads[i].join(); - } - catch(InterruptedException ex){} - } - } - } - + if(pending.size() > 0 || running.size() > 0){ synchronized(runningLock){ - if(pending.size() > 0 && running.size() < 1){ - if(LOG.isDebugEnabled()){ - LOG.debug("waiting for idle threads to run."); - } - - try{ - runningLock.wait(); - } - catch(InterruptedException ex){} + while(running.size() > 0){ + runningLock.wait(); } } } @@ -275,24 +222,31 @@ private Thread _getThread(Runnable runnable, String threadName, long threadWaitMillis){ Thread t = null; synchronized(pendingLock){ - long startTime = System.currentTimeMillis(); - while((pending.size() >= maxPendingSize) && - ((System.currentTimeMillis() - startTime) < threadWaitMillis)) + long start = System.currentTimeMillis(); + while(pending.size() >= maxPendingSize && + (threadWaitMillis < 1 || + System.currentTimeMillis() - start < threadWaitMillis)) { - if (LOG.isDebugEnabled()) { - LOG.debug("waiting for pending thread count to drop."); + if (LOG.isDebugEnabled()) {LOG.debug("Pending queue size: " + pending.size());} + if (LOG.isTraceEnabled()) { + LOG.trace("waiting for pending thread count to drop."); } try{ - pendingLock.wait(threadWaitMillis); + if(threadWaitMillis > 0){ + pendingLock.wait(threadWaitMillis); + } + else{ + pendingLock.wait(); + } } catch(InterruptedException ex){ } } if(pending.size() >= maxPendingSize){ - if(LOG.isDebugEnabled()){ - LOG.debug("pending.size() {" + pending.size() + "} is greater than or equal to maxPendingSize {" + maxPendingSize + "}"); + if(LOG.isTraceEnabled()){ + LOG.trace("pending.size() {" + pending.size() + "} is greater than or equal to maxPendingSize {" + maxPendingSize + "}"); } throw new EmptyStackException(); @@ -308,41 +262,26 @@ pending.add(t); } - if(LOG.isDebugEnabled()){ - LOG.debug("returning thread from " + this); + if(LOG.isTraceEnabled()){ + LOG.trace("returning thread from " + this); } return t; } - /** Callback for NotifierRunnable to adjust the counts of running and pending - * in response to the starting of the runnable's run() method. - */ - private void threadStarted(){ - synchronized(pendingLock){ - pending.remove(Thread.currentThread()); - pendingLock.notify(); - } - - synchronized(runningLock){ - running.add(Thread.currentThread()); - runningLock.notify(); - } - - synchronized(this){ - notifyAll(); - } - } - /** Callback for NotifierRunnable to adjust the count of running * in response to the finish of the runnable's run() method. */ private void threadFinished(){ + if (LOG.isTraceEnabled()) {LOG.trace("Acquiring lock on running queue to remove finished thread.");} synchronized(runningLock){ + if (LOG.isDebugEnabled()) {LOG.debug("Running queue size: " + running.size());} running.remove(Thread.currentThread()); - runningLock.notify(); + runningLock.notifyAll(); + if (LOG.isDebugEnabled()) {LOG.debug("Running queue size: " + running.size());} } + if (LOG.isTraceEnabled()) {LOG.trace("Notifying object \'this\' of finished thread.");} synchronized(this){ notifyAll(); } @@ -353,28 +292,45 @@ * of milliseconds, approximately, and fail if it is not woken before then. * @param waitMillis The number of milliseconds to wait before failing. */ - private void maybeWaitForThreshold(long waitMillis){ + private void maybeWaitAndStart() throws InterruptedException{ + boolean added = false; synchronized(runningLock){ - long startTime = System.currentTimeMillis(); - while((running.size() >= maxRunningSize) && - ((System.currentTimeMillis() - startTime) < waitMillis)) + while(running.size() >= maxRunningSize) { - if (LOG.isDebugEnabled()) { - LOG.debug("waiting for running thread count to drop."); + if (LOG.isDebugEnabled()) {LOG.debug("BEGIN WHILE: Running queue size: " + running.size());} + + if (LOG.isTraceEnabled()) { + LOG.trace("waiting for running thread count to drop."); } - try{ - runningLock.wait(waitMillis); + runningLock.wait(); + } + + // In case another thread's successful add to the running queue triggers this thread's wait() to end... + if(running.size() < maxRunningSize){ + if (LOG.isDebugEnabled()) {LOG.debug("PRE-PUSH: Running queue size: " + running.size());} + + if (LOG.isTraceEnabled()) { + LOG.trace("launching next thread"); } - catch(InterruptedException ex){} - if (LOG.isDebugEnabled()) { - LOG.debug("launching next thread"); - } + running.add(Thread.currentThread()); + added = true; + + if (LOG.isDebugEnabled()) {LOG.debug("POST-PUSH: Running queue size: " + running.size());} + } + } + + if(added){ + synchronized(pendingLock){ + if (LOG.isDebugEnabled()) {LOG.debug("POST-WAIT&START: Pending queue size: " + pending.size());} + pending.remove(Thread.currentThread()); + pendingLock.notifyAll(); + if (LOG.isDebugEnabled()) {LOG.debug("POST-WAIT&START_POST-PUSH: Pending queue size: " + pending.size());} } - if(running.size() >= maxRunningSize){ - throw new EmptyStackException(); + synchronized(this){ + notifyAll(); } } } @@ -406,18 +362,17 @@ * */ public void run() { - maybeWaitForThreshold(waitMillis); - - if(runnable instanceof EnhancedControlRunnable){ - ((EnhancedControlRunnable)runnable).preStart(); + try { + maybeWaitAndStart(); + runnable.run(); } - - threadStarted(); - runnable.run(); - threadFinished(); - - if(runnable instanceof EnhancedControlRunnable){ - ((EnhancedControlRunnable)runnable).postFinish(); + catch (InterruptedException e) { + if (LOG.isWarnEnabled()) { + LOG.warn("Thread caught InterruptedException while awaiting execution slot.", e); + } + } + finally{ + threadFinished(); } } |
|
From: <joh...@co...> - 2004-02-19 14:30:29
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-util/src/test/org/commonjava/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2943/src/test/org/commonjava/util Added Files: ThreadThrottleTest.java Log Message: flushed out most of the problems with ThreadThrottle. It should work properly now. --- NEW FILE: ThreadThrottleTest.java --- /* * Created on Feb 10, 2004 * */ package org.commonjava.util; import java.util.EmptyStackException; import junit.framework.TestCase; //TODO: Add JavaDoc to ThreadThrottleTest in commonjava-util! /** * * @ * */ public class ThreadThrottleTest extends TestCase { /** * Constructor for ThreadThrottleTest. * @param arg0 */ public ThreadThrottleTest(String arg0) { super(arg0); } public static void main(String[] args) { junit.textui.TestRunner.run(ThreadThrottleTest.class); } public void testPendingExceededInfiniteWait() throws Exception{ ThreadThrottle throttle = new ThreadThrottle(25, 10, -1); for(int i=0; i<75; i++){ try{ Thread th = throttle.getThread(new TestRunnable(10)); th.setPriority(Thread.currentThread().getPriority()-1); th.start(); } catch(Exception e){ e.printStackTrace(); throw e; } } } public void testPendingExceededSmallWait(){ ThreadThrottle throttle = new ThreadThrottle(25, 5, 500); for(int i=0; i<75; i++){ try{ Thread th = throttle.getThread(new TestRunnable(5)); th.setPriority(Thread.currentThread().getPriority()-1); System.out.println("Starting thread " + i); th.start(); } catch(EmptyStackException e){ System.out.println("Timeout on thread retrieval from throttle on thread: " + i); } } } public void testJoinAllMicroPopWaitInfiniteJoinWait(){ ThreadThrottle throttle = new ThreadThrottle(25, 10, 10); for(int i=0; i<75; i++){ try{ Thread th = throttle.getThread(new TestRunnable(10)); th.setPriority(Thread.currentThread().getPriority()-1); System.out.println("Starting thread " + i); th.start(); } catch(EmptyStackException e){ System.out.println("Timeout on thread retrieval from throttle on thread: " + i); } } System.out.println("joining all threads."); try { throttle.joinAll(); } catch (InterruptedException e) { e.printStackTrace(); } System.out.println("join finished."); } public void testJoinAllMicroPopWaitSmallJoinWait(){ ThreadThrottle throttle = new ThreadThrottle(25, 10, 10); for(int i=0; i<75; i++){ try{ Thread th = throttle.getThread(new TestRunnable(10)); th.setPriority(Thread.currentThread().getPriority()-1); System.out.println("Starting thread " + i); th.start(); } catch(EmptyStackException e){ System.out.println("Timeout on thread retrieval from throttle on thread: " + i); } } System.out.println("joining with 1 sec wait per thread."); try { throttle.joinAll(300); } catch (InterruptedException e) { e.printStackTrace(); } System.out.println("join finished."); } private static class TestRunnable implements Runnable{ private static int count = 0; private int maxRunning; TestRunnable(int max){ maxRunning = max; } public void run(){ try { synchronized(TestRunnable.class){ System.out.println("Thread started."); System.out.flush(); } Thread.sleep(500); } catch (InterruptedException e) { e.printStackTrace(); fail("Test runnable should not be interrupted."); } synchronized(TestRunnable.class){ System.out.println("Thread finished."); System.out.flush(); } } } } |
|
From: <joh...@co...> - 2004-02-19 14:30:28
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2943 Modified Files: .classpath Log Message: flushed out most of the problems with ThreadThrottle. It should work properly now. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-util/.classpath,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- .classpath 5 Jan 2004 14:43:09 -0000 1.5 +++ .classpath 19 Feb 2004 14:20:06 -0000 1.6 @@ -1,10 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <classpathentry kind="src" path="src/java"/> - <classpathentry kind="src" path="src/test"/> - <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/commons-logging/jars/commons-logging-1.0.2.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> - <classpathentry kind="output" path="target/classes"/> -</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-lang-2.0.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.2.jar"> + </classpathentry> + <classpathentry kind="output" path="target\classes"> + </classpathentry> +</classpath> \ No newline at end of file |
|
From: <joh...@co...> - 2004-02-18 06:22:52
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-codec In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27005 Modified Files: project.xml Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-codec/project.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- project.xml 16 Feb 2004 07:03:23 -0000 1.2 +++ project.xml 18 Feb 2004 06:13:32 -0000 1.3 @@ -3,7 +3,7 @@ <project> <pomVersion>3</pomVersion> <id>commonjava-codec</id> - <name>CommonJava Encoding/Decoding Libraries</name> + <name>En/Decoding Libraries</name> <groupId>commonjava</groupId> <currentVersion>2.0</currentVersion> <organization> |
|
From: <joh...@co...> - 2004-02-18 06:22:46
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-datasrc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26992 Modified Files: project.xml Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- project.xml 29 Jan 2004 03:54:32 -0000 1.3 +++ project.xml 18 Feb 2004 06:13:26 -0000 1.4 @@ -3,7 +3,7 @@ <project> <pomVersion>3</pomVersion> <id>commonjava-datasrc</id> - <name>CommonJava Data Source Objects</name> + <name>Data Source Objects</name> <groupId>commonjava</groupId> <currentVersion>2.1-1</currentVersion> <organization> @@ -13,6 +13,11 @@ <inceptionYear>2002</inceptionYear> <package>org.commonjava.datasrc</package> + <description> + Contains basic objects used in retrieving datasources of different types. Currently only houses + the CommonJava implementation of an SQL connection pool. It's basic, but works. + </description> + <dependencies> <dependency> <groupId>commonjava</groupId> |
|
From: <joh...@co...> - 2004-02-18 06:22:30
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-dirdigester In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26953 Modified Files: project.xml Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-dirdigester/project.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- project.xml 2 Feb 2004 07:03:52 -0000 1.2 +++ project.xml 18 Feb 2004 06:13:11 -0000 1.3 @@ -3,9 +3,9 @@ <project> <pomVersion>3</pomVersion> <id>commonjava-dirdigester</id> - <name>CommonJava Directory Fingerprint Generator</name> + <name>Directory Digester</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> @@ -13,6 +13,14 @@ <inceptionYear>2002</inceptionYear> <package>org.commonjava.dirdigester</package> + <description> + This project simply creates an MD5 digest for every file in a directory structure, given certain + filename filters, and writes them to a single file along with the search options used to generate + them. In this way, it creates a unique fingerprint, or digest, for the directory. These fingerprints + can then be used as a quick way (faster than diff) to reliably check for content changes within + the directory structure. + </description> + <dependencies> <dependency> <groupId>commonjava</groupId> |
|
From: <joh...@co...> - 2004-02-18 06:22:30
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-dirdigester/src/java/org/commonjava/dirdigester In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26953/src/java/org/commonjava/dirdigester Modified Files: DirectoryDigest.java Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: DirectoryDigest.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-dirdigester/src/java/org/commonjava/dirdigester/DirectoryDigest.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- DirectoryDigest.java 31 Dec 2003 01:16:01 -0000 1.1.1.1 +++ DirectoryDigest.java 18 Feb 2004 06:13:11 -0000 1.2 @@ -7,6 +7,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; import java.util.Map; /** @@ -43,6 +44,82 @@ return options.equals(digest.getOptions()); } + public List calculateAllChanges(DirectoryDigest digest){ + List results = new ArrayList(); + results = _calculateAdded(digest, results); + results = _calculateRemoved(digest, results); + results = _calculateChangedExisting(digest, results); + + return results; + } + + public List calculateAdded(DirectoryDigest digest){ + return _calculateAdded(digest, new ArrayList()); + } + + public List calculateRemoved(DirectoryDigest digest){ + return _calculateRemoved(digest, new ArrayList()); + } + + public List calculateChangedExisting(DirectoryDigest digest){ + return _calculateChangedExisting(digest, new ArrayList()); + } + + private List _calculateChangedExisting(DirectoryDigest digest, List deltas){ + Map stored = digest.getDigests(); + for (Iterator it = digests.keySet().iterator(); it.hasNext(); ){ + String fname = (String)it.next(); + byte[] storeData = (byte[])stored.get(fname); + byte[] genData = (byte[])digests.get(fname); + + if(storeData != null) { + if(storeData.length != genData.length) { + deltas.add(fname); + } + else { + for (int i = 0; i < genData.length; i++){ + if(genData[i] != storeData[i]) { + deltas.add(fname); + break; + } + } + } + } + } + + return deltas; + } + + private List _calculateAdded(DirectoryDigest digest, List deltas){ + Map stored = digest.getDigests(); + for (Iterator it = digests.keySet().iterator(); it.hasNext(); ){ + String fname = (String)it.next(); + byte[] storeData = (byte[])stored.get(fname); + byte[] genData = (byte[])digests.get(fname); + + if(storeData == null) { + deltas.add(fname); + } + } + + return deltas; + } + + private List _calculateRemoved(DirectoryDigest digest, List deltas){ + Map stored = digest.getDigests(); + for (Iterator it = stored.keySet().iterator(); it.hasNext(); ){ + String fname = (String)it.next(); + byte[] storeData = (byte[])stored.get(fname); + byte[] genData = (byte[])digests.get(fname); + + if(genData == null) { + deltas.add(fname); + } + } + + return deltas; + } + public String[] compareWithoutOptions(DirectoryDigest digest) { ArrayList deltas = new ArrayList(); Map stored = digest.getDigests(); |
|
From: <joh...@co...> - 2004-02-18 06:22:20
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26899 Modified Files: project.xml .project .classpath Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-io/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.xml 18 Sep 2003 01:02:43 -0000 1.1 +++ project.xml 18 Feb 2004 06:13:00 -0000 1.2 @@ -3,7 +3,7 @@ <project> <pomVersion>3</pomVersion> <id>commonjava-io</id> - <name>CommonJava I/O Library</name> + <name>I/O</name> <groupId>commonjava</groupId> <currentVersion>2.0</currentVersion> <organization> @@ -13,6 +13,12 @@ <inceptionYear>2002</inceptionYear> <package>org.commonjava.io</package> + <description> + This project attempts to homogenize I/O to/from various sources, when the user doesn't need all the + advanced options provided by each unique type. Currently supports files, classpath resources, and + HTTP URLs. + </description> + <dependencies> <dependency> <groupId>commonjava</groupId> Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-io/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .project 18 Sep 2003 01:02:43 -0000 1.1 +++ .project 18 Feb 2004 06:13:00 -0000 1.2 @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> - <projectDescription> - <name>commonjava-io</name> - <comment> + <name>commonjava-io</name> + <comment> </comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> \ No newline at end of file + <projects> + <project>commonjava-lang</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-io/.classpath,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- .classpath 15 Dec 2003 01:49:59 -0000 1.4 +++ .classpath 18 Feb 2004 06:13:00 -0000 1.5 @@ -1,14 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> - <classpath> - <classpathentry kind="src" path="src/java"> - </classpathentry> - <classpathentry kind="var" rootpath="JRE_SRCROOT" path="JRE_LIB" sourcepath="JRE_SRC"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-lang-2.0.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.2.jar"> - </classpathentry> - <classpathentry kind="output" path="target/classes"> - </classpathentry> -</classpath> \ No newline at end of file + <classpathentry kind="src" path="src/java"/> + <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.2.jar"/> + <classpathentry kind="src" path="/commonjava-lang"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> |
|
From: <joh...@co...> - 2004-02-18 06:22:13
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-config-crypto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26885 Modified Files: project.xml Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config-crypto/project.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- project.xml 16 Jan 2004 02:20:09 -0000 1.8 +++ project.xml 18 Feb 2004 06:12:54 -0000 1.9 @@ -3,7 +3,7 @@ <project> <pomVersion>3</pomVersion> <id>commonjava-config-crypto</id> - <name>CommonJava Cryptography Configuration Point</name> + <name>Cryptography Configurations</name> <groupId>commonjava</groupId> <currentVersion>2.1-3</currentVersion> <organization> @@ -13,6 +13,11 @@ <inceptionYear>2002</inceptionYear> <package>org.commonjava.config.crypto</package> + <description> + This project merely maintains a configuration set for cryptography-based parameters, along with + an OPL parser library used to instantiate the configuration from namespaced XML. + </description> + <dependencies> <dependency> <groupId>commonjava</groupId> |
|
From: <joh...@co...> - 2004-02-18 06:22:08
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26828 Modified Files: project.xml .classpath Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- project.xml 15 Dec 2003 01:50:10 -0000 1.3 +++ project.xml 18 Feb 2004 06:12:47 -0000 1.4 @@ -3,9 +3,9 @@ <project> <pomVersion>3</pomVersion> <id>commonjava-enterprise-services</id> - <name>CommonJava Enterprise Service Utilities</name> + <name>Enterprise Services</name> <groupId>commonjava</groupId> - <currentVersion>2.1</currentVersion> + <currentVersion>2.1-1</currentVersion> <organization> <name>CommonJava Open Component Project</name> <url>http://www.commonjava.org</url> @@ -13,6 +13,20 @@ <inceptionYear>2002</inceptionYear> <package>org.commonjava.j2ee.services</package> + <description> + Enterprise Services simply provides a lookup mechanism for EJBs DataSource's, JMS, and generic + JNDI-bound service objects. It uses config-jndi to store and configure the various JNDI profiles + to be used for each type of lookup, with the possibility of using a different JNDI tree for each + type. Additionally, each lookup type also supports local lookups, which simply uses an empty + InitialContext constructor for the JNDI access. + + In the future, it will also provide a mapping service implicitly, which will allow code to + depend upon a certain set of pseudo-JNDI binding names, which then resolve via mappings to "real" + JNDI bindings for the components in question. This will decouple the development process from the + deployment process, in that the hard-coded (in one place or another) names will be separated from + the runtime names. + </description> + <dependencies> <dependency> <groupId>commonjava</groupId> @@ -24,14 +38,14 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-util</artifactId> - <version>2.0</version> + <version>2.0-2</version> <url>http://www.commonjava.org</url> </dependency> <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-opl</artifactId> - <version>2.1-1</version> + <version>2.1-5</version> <url>http://www.commonjava.org</url> </dependency> @@ -45,6 +59,13 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-config-jndi</artifactId> + <version>2.1-4</version> + <url>http://www.commonjava.org</url> + </dependency> + + <dependency> + <groupId>commonjava</groupId> + <artifactId>commonjava-config</artifactId> <version>2.1-1</version> <url>http://www.commonjava.org</url> </dependency> @@ -59,7 +80,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.0.2</version> + <version>1.0.3</version> <url>http://jakarta.apache.org/commons/logging.html</url> </dependency> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .classpath 15 Dec 2003 01:50:10 -0000 1.3 +++ .classpath 18 Feb 2004 06:12:47 -0000 1.4 @@ -1,32 +1,18 @@ <?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-lang-2.0.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-opl-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-config-jndi-2.1-1.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-reflection-2.0.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-2.0.jar"> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ejb/jars/ejb-2.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-lang-2.0.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-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/commonjava/jars/commonjava-opl-2.1-4.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0-2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-config-jndi-2.1-3.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-config-2.1.jar"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> |
|
From: <joh...@co...> - 2004-02-18 06:22:07
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/src/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26828/src/test Modified Files: enterprise.xml Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: enterprise.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/src/test/enterprise.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- enterprise.xml 7 Oct 2003 19:40:38 -0000 1.1 +++ enterprise.xml 18 Feb 2004 06:12:47 -0000 1.2 @@ -1,16 +1,20 @@ <?xml version="1.0"?> -<e:enterprise-config xmlns:e="opl:enterprise" xmlns:prop="opl:properties"> - <e:ejb-config id="singlesrc"> +<enterprise-config xmlns="opl:enterprise" + xmlns:prop="opl:properties" + xmlns:j="opl:jndi" + ejbRefId="singlesrc" + jmsRefId="singlesrc" + jdbcRefId="singlesrc" + qConnFactoryBinding="QueueConnFactory"> + + <j:jndi-config id="singlesrc" useContextEnvironment="true"> <prop:properties> <prop:property name="java.naming.context.initial" value="jrunx.jndi.JrunInitialContext" /> <prop:property name="java.naming.security.principal" value="guest" /> <prop:property name="java.naming.security.credentials" value="guest" /> <prop:property name="java.naming.provider.url" value="localhost:1099" /> </prop:properties> - </e:ejb-config> - - <e:jdbc-config id="jdbc" refId="singlesrc" /> - <e:jms-config id="jms" refId="singlesrc" queueConnectionFactory-binding="QueueConnFactory" /> + </j:jndi-config> -</e:enterprise-config> +</enterprise-config> |
|
From: <joh...@co...> - 2004-02-18 06:22:07
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/src/java/org/commonjava/j2ee/services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26828/src/java/org/commonjava/j2ee/services Modified Files: ServiceLocator.java Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: ServiceLocator.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/src/java/org/commonjava/j2ee/services/ServiceLocator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ServiceLocator.java 10 Oct 2003 03:14:36 -0000 1.2 +++ ServiceLocator.java 18 Feb 2004 06:12:47 -0000 1.3 @@ -88,6 +88,39 @@ return result; } + /** Retrieve the JNDI configuration for service lookups, then lookup the specified + * service object. + * @param jndiName The JNDI binding. + * @param serviceClass The class of the service to retrieve. + */ + public static Object getService(String jndiName, Class serviceClass) + throws EnterpriseConfigurationException, NamingException + { + Object result = null; + InitialContext ctx = null; + try{ + EnterpriseConfiguration config = EnterpriseConfiguration.getConfiguration(); + JndiConfig jndiConfig = config.getEjbJndiConfig(); + if(jndiConfig.useContextEnvironment()){ + ctx = new InitialContext(jndiConfig.getEnvironment()); + } + else{ + ctx = new InitialContext(); + } + result = ctx.lookup(jndiName); + if(!serviceClass.isInstance(result)){ + result = PortableRemoteObject.narrow(result, serviceClass); + } + } + finally{ + if(ctx != null){ + ctx.close(); + } + } + + return result; + } + /** Retrieve the JNDI configuration for JDBC lookups, then lookup the specified * jndi binding and return a JMS queue connection information object. * @param jndiName The JNDI binding @@ -98,4 +131,88 @@ return null; } + /** 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 static Object getLocalEjbHome(String jndiName, Class castTo) + throws EnterpriseConfigurationException, NamingException + { + Object result = null; + InitialContext ctx = null; + try{ + ctx = new InitialContext(); + result = ctx.lookup(jndiName); + if(!castTo.isInstance(result)){ + result = PortableRemoteObject.narrow(result, castTo); + } + } + finally{ + if(ctx != null){ + ctx.close(); + } + } + + return result; + } + + /** Retrieve the JNDI configuration for JDBC lookups, then lookup the specified + * jndi binding and return a JDBC DataSource. + * @param jndiName The JNDI binding + */ + public static DataSource getLocalDataSource(String jndiName) + throws EnterpriseConfigurationException, NamingException + { + DataSource result = null; + InitialContext ctx = null; + try{ + ctx = new InitialContext(); + result = (DataSource)ctx.lookup(jndiName); + } + finally{ + if(ctx != null){ + ctx.close(); + } + } + + return result; + } + + /** Retrieve the JNDI configuration for service lookups, then lookup the specified + * service object. + * @param jndiName The JNDI binding. + * @param serviceClass The class of the service to retrieve. + */ + public static Object getLocalService(String jndiName, Class serviceClass) + throws EnterpriseConfigurationException, NamingException + { + Object result = null; + InitialContext ctx = null; + try{ + ctx = new InitialContext(); + result = ctx.lookup(jndiName); + if(!serviceClass.isInstance(result)){ + result = PortableRemoteObject.narrow(result, serviceClass); + } + } + finally{ + if(ctx != null){ + ctx.close(); + } + } + + return result; + } + + /** Retrieve the JNDI configuration for JDBC lookups, then lookup the specified + * jndi binding and return a JMS queue connection information object. + * @param jndiName The JNDI binding + */ + public static JmsQueueInfo getLocalJmsQueue(String jndiName) + { + //FINISH Implement getJmsQueue(String):JmsQueueInfo in ServiceLocator. + return null; + } + } |
|
From: <joh...@co...> - 2004-02-18 06:22:07
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/src/java/org/commonjava/j2ee/services/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26828/src/java/org/commonjava/j2ee/services/config Modified Files: EnterpriseConfiguration.java Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: EnterpriseConfiguration.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/src/java/org/commonjava/j2ee/services/config/EnterpriseConfiguration.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EnterpriseConfiguration.java 10 Oct 2003 03:14:36 -0000 1.2 +++ EnterpriseConfiguration.java 18 Feb 2004 06:12:46 -0000 1.3 @@ -7,6 +7,7 @@ import org.commonjava.config.jndi.JndiConfig; import org.commonjava.config.jndi.JndiConfigConsumer; import org.commonjava.config.jndi.JndiConfigContainerSupport; +import org.commonjava.config.snapin.ConfigSnapIn; import org.commonjava.opl.DocumentDriver; import org.commonjava.opl.OPLEngine; import org.commonjava.opl.ParseException; @@ -17,8 +18,10 @@ * @author John Casey * */ -public class EnterpriseConfiguration implements JndiConfigConsumer +public class EnterpriseConfiguration implements JndiConfigConsumer, ConfigSnapIn { + public static final String SNAP_IN_ID = EnterpriseConfiguration.class.getName(); + private static final String CONFIG_URL = "cprs:///enterprise.xml"; private static EnterpriseConfiguration INSTANCE; @@ -27,6 +30,7 @@ private String ejbRefId; private String jdbcRefId; private String jmsRefId; + private String serviceRefId; private String jmsQueueConnectionFactoryBinding; /** Your Basic Constructor. ONLY TO BE USED BY OPL ENGINE PARSER. @@ -59,6 +63,13 @@ this.ejbRefId = refId; } + /** Set the JNDI configuration id to access for service lookup. + * @param refId the JNDI configuration id. + */ + public void setServiceRefId(String refId) { + this.serviceRefId = refId; + } + /** Set the JNDI configuration id to access for JDBC DataSource lookup. * @param refId the JNDI configuration id. */ @@ -136,4 +147,12 @@ } } + /** Return the identifier for this configuration snap-in. + * @return the snap-in id. + * @see org.commonjava.config.snapin.ConfigSnapIn#getSnapInId() + */ + public String getSnapInId() { + return SNAP_IN_ID; + } + } |
|
From: <joh...@co...> - 2004-02-18 06:22:07
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/src/java/META-INF/parsers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26828/src/java/META-INF/parsers Modified Files: enterprise.opl Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: enterprise.opl =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/src/java/META-INF/parsers/enterprise.opl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- enterprise.opl 7 Oct 2003 19:40:38 -0000 1.1 +++ enterprise.opl 18 Feb 2004 06:12:47 -0000 1.2 @@ -2,7 +2,4 @@ <parser-library xmlns="dynalib" ignore-unrecognized="false"> <parser node="enterprise-config" class="org.commonjava.j2ee.services.config.xmlparse.EnterpriseConfigParser" /> - <parser node="ejb-config" class="org.commonjava.j2ee.services.config.xmlparse.EjbConfigParser" /> - <parser node="jms-config" class="org.commonjava.j2ee.services.config.xmlparse.JmsConfigParser" /> - <parser node="jdbc-config" class="org.commonjava.j2ee.services.config.xmlparse.JdbcConfigParser" /> </parser-library> |
Update of /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/src/java/org/commonjava/j2ee/services/config/xmlparse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26828/src/java/org/commonjava/j2ee/services/config/xmlparse Modified Files: EnterpriseConfigParser.java Removed Files: JdbcConfigParser.java JmsConfigParser.java EjbConfigParser.java Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: EnterpriseConfigParser.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-enterprise-services/src/java/org/commonjava/j2ee/services/config/xmlparse/EnterpriseConfigParser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EnterpriseConfigParser.java 7 Oct 2003 19:40:38 -0000 1.1 +++ EnterpriseConfigParser.java 18 Feb 2004 06:12:46 -0000 1.2 @@ -6,11 +6,14 @@ import org.commonjava.config.jndi.JndiConfig; import org.commonjava.config.jndi.JndiConfigConsumer; +import org.commonjava.config.snapin.SnapInContainer; import org.commonjava.j2ee.services.config.EnterpriseConfiguration; +import org.commonjava.opl.ElementInfo; import org.commonjava.opl.NodeParser; import org.commonjava.opl.OPLContext; import org.commonjava.opl.OPLModelRoot; import org.commonjava.opl.ParseException; +import org.commonjava.util.Strings; /** Parse a J2EE configuration specification into an EnterpriseConfiguration * object. @@ -21,6 +24,12 @@ implements JndiConfigConsumer, OPLModelRoot { + private static final String EJB_REF_ID = "ejbRefId"; + private static final String JMS_REF_ID = "jmsRefId"; + private static final String SERVICE_REF_ID = "serviceRefId"; + private static final String JDBC_REF_ID = "jdbcRefId"; + private static final String JMS_QUEUE_CONNECTION_FACTORY_BINDING = "qConnFactoryBinding"; + private EnterpriseConfiguration config = new EnterpriseConfiguration(); /** Create a new Parser. @@ -54,27 +63,6 @@ config.addJndiConfig(cfg); } - /** Set the refId of the JndiConfig object to use for looking up EJBs. - * @param refId The reference to the JndiConfig object. - */ - public void setEjbRefId(String refId) { - config.setEjbRefId(refId); - } - - /** Set the refId of the JndiConfig object to use for looking up DataSources. - * @param refId The reference to the JndiConfig object. - */ - public void setJdbcRefId(String refId) { - config.setJdbcRefId(refId); - } - - /** Set the refId of the JndiConfig object to use for looking up Queues and Topics. - * @param refId The reference to the JndiConfig object. - */ - public void setJmsRefId(String refId) { - config.setJmsRefId(refId); - } - /** Return the parsed EnterpriseConfiguration object. * @return the parsed configuration. * @throws ParseException @@ -84,12 +72,32 @@ return config; } - /** Set the JNDI binding for the JMS QueueConnectionFactory to use in gaining - * access to a JMS queue. - * @param binding The JNDI binding for the QueueConnectionFactory + /** Look for a SnapInContainer in the ancestor stack, and if found, add the embedded + * enterprise config to it. + * @see org.commonjava.opl.NodeParser#doAfterChildren(org.commonjava.opl.ElementInfo, java.lang.String) */ - public void setJmsQueueConnectionFactoryBinding(String binding) { - config.setJmsQueueConnectionFactoryBinding(binding); + protected void doAfterChildren(ElementInfo element, String body) + throws ParseException + { + String ejbId = getAttribute(EJB_REF_ID, element, true); + if(!Strings.empty(ejbId)){config.setEjbRefId(ejbId);} + + String jmsId = getAttribute(JMS_REF_ID, element, true); + if(!Strings.empty(jmsId)){config.setJmsRefId(jmsId);} + + String serviceId = getAttribute(SERVICE_REF_ID, element, true); + if(!Strings.empty(serviceId)){config.setServiceRefId(serviceId);} + + String jdbcId = getAttribute(JDBC_REF_ID, element, true); + if(!Strings.empty(jdbcId)){config.setJdbcRefId(jdbcId);} + + String qConnFac = getAttribute(JMS_QUEUE_CONNECTION_FACTORY_BINDING, element, true); + if(!Strings.empty(qConnFac)){config.setJmsQueueConnectionFactoryBinding(qConnFac);} + + SnapInContainer container = (SnapInContainer)findAncestorOfType(SnapInContainer.class, false); + if(container != null){ + container.addSnapIn(config); + } } } --- JdbcConfigParser.java DELETED --- --- JmsConfigParser.java DELETED --- --- EjbConfigParser.java DELETED --- |
|
From: <joh...@co...> - 2004-02-18 06:21:58
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-math In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26811 Modified Files: project.xml Log Message: updated documentation in project.xml files, and added functionality to: Console: - provide convenient way to prompt the user for more information Config: - Provide snap-in container stacking, or scoping - Provide a JBoss service implementation of a snap-in container Probably other things, but I don't honestly remember everything... Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-math/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.xml 18 Sep 2003 01:21:07 -0000 1.1 +++ project.xml 18 Feb 2004 06:12:39 -0000 1.2 @@ -3,7 +3,7 @@ <project> <pomVersion>3</pomVersion> <id>commonjava-math</id> - <name>CommonJava Math Library</name> + <name>Math</name> <groupId>commonjava</groupId> <currentVersion>2.0</currentVersion> <organization> @@ -13,6 +13,11 @@ <inceptionYear>2002</inceptionYear> <package>org.commonjava.math</package> + <description> + Provides some higher-level math functionality. Currently only provides variance and standard + deviation, in support of the Binary Diff project. + </description> + <dependencies> <dependency> <groupId>commons-logging</groupId> |
