commonjava-developer Mailing List for CommonJava Open Component Project (Page 10)
Brought to you by:
johnqueso
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:29:02
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12426 Modified Files: .project .classpath Log Message: corrected versioning differences...everything is up to date. Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-console/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .project 18 Sep 2003 00:46:59 -0000 1.1 +++ .project 20 Feb 2004 21:17:38 -0000 1.2 @@ -2,8 +2,7 @@ <projectDescription> <name>commonjava-console</name> - <comment> - </comment> + <comment>Console Framework is getopt on steroids. It contains object formatters, which transform a string read from the command line into any number of object types, along with providing validation that that string conforms to the definition of a valid instance of that type. It contains a Command base object, which can accept multiple command line templates which each define a combination of command-line options that constitute a valid invocation. Command-line templates are merely arrays of Option instances, which in turn are specifications of a short name (invoked as '-f xxx'), a long name (invoked as "--file=xxx"), possibly an OptionFormat value (these are a pseudo-enumerated type with added functionality outlined above), and a description of what the option means to the command line. The command itself is instantiated with a description of what it does, plus an optional description of what the non-option arguments mean to the invocation. In addition, the empty command template can be en/disabled (invocation with no options), and the in/out/err streams can be set. Built on top of all this is the notion of a Console, which accepts and parses a command invocation from somewhere into an array of strings (static void main(String[] args) style), and then looks up the appropriate command instance and invokes it with the options. The BasicConsole has a help command built in, which shows all available commands and their associated usages.</comment> <projects> </projects> <buildSpec> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-console/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .classpath 15 Dec 2003 01:51:11 -0000 1.3 +++ .classpath 20 Feb 2004 21:17:38 -0000 1.4 @@ -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> @@ -11,6 +11,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-20 21:28:51
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-site In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12408 Added Files: logging.properties Log Message: corrected versioning differences...everything is up to date. --- NEW FILE: logging.properties --- handlers= java.util.logging.ConsoleHandler .level= INFO java.util.logging.ConsoleHandler.level = FINEST java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter org.commonjava.opl.level=FINEST |
From: <joh...@co...> - 2004-02-20 21:28:43
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-datasrc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12369 Modified Files: .project .classpath project.xml Log Message: corrected versioning differences...everything is up to date. Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .project 18 Sep 2003 00:50:59 -0000 1.1 +++ .project 20 Feb 2004 21:17:21 -0000 1.2 @@ -2,8 +2,7 @@ <projectDescription> <name>commonjava-datasrc</name> - <comment> - </comment> + <comment>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.</comment> <projects> </projects> <buildSpec> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/.classpath,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- .classpath 29 Jan 2004 03:54:32 -0000 1.5 +++ .classpath 20 Feb 2004 21:17:21 -0000 1.6 @@ -1,15 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <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-util-2.0-2.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-opl-2.1-4.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.3.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.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/commonjava/jars/commonjava-util-2.0-3.jar"> + </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-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/hsqldb/jars/hsqldb-1.7.1.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 Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- project.xml 18 Feb 2004 06:13:26 -0000 1.4 +++ project.xml 20 Feb 2004 21:17:21 -0000 1.5 @@ -29,14 +29,14 @@ <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> <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> |
From: <joh...@co...> - 2004-02-20 21:28:36
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-codec In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12338 Modified Files: .classpath .project Log Message: corrected versioning differences...everything is up to date. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-codec/.classpath,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- .classpath 16 Feb 2004 07:03:23 -0000 1.4 +++ .classpath 20 Feb 2004 21:17:14 -0000 1.5 @@ -1,11 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <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-io"/> - <classpathentry kind="src" path="/commonjava-lang"/> - <classpathentry kind="src" path="/commonjava-reflection"/> - <classpathentry kind="src" path="/commonjava-util"/> - <classpathentry kind="output" path="target/classes"/> -</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/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.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 Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-codec/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .project 16 Feb 2004 07:03:23 -0000 1.2 +++ .project 20 Feb 2004 21:17:14 -0000 1.3 @@ -1,22 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> - <name>commonjava-codec</name> - <comment> - </comment> - <projects> - <project>commonjava-io</project> - <project>commonjava-lang</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-codec</name> + <comment>Basically defunct set of en/decoders for XML formatting/parsing regex-based file parsing, and javabeans formatting. May revive the regex-based file parsing, since this is still a pretty good idea, but it doesn't quite fit into the common mold with XML parsing. And it really shouldn't... The rest is definitely on the way out, though.</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 |
From: <joh...@co...> - 2004-02-20 21:28:30
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12322 Modified Files: .project .classpath Log Message: corrected versioning differences...everything is up to date. Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-io/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .project 18 Feb 2004 06:13:00 -0000 1.2 +++ .project 20 Feb 2004 21:17:08 -0000 1.3 @@ -1,19 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> - <name>commonjava-io</name> - <comment> - </comment> - <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> + <name>commonjava-io</name> + <comment>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.</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-io/.classpath,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- .classpath 18 Feb 2004 06:13:00 -0000 1.5 +++ .classpath 20 Feb 2004 21:17:08 -0000 1.6 @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <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> + <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 |
From: <joh...@co...> - 2004-02-20 21:28:24
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-caching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12264 Modified Files: .project .classpath Log Message: corrected versioning differences...everything is up to date. Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-caching/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .project 18 Sep 2003 00:34:01 -0000 1.1 +++ .project 20 Feb 2004 21:17:01 -0000 1.2 @@ -2,8 +2,7 @@ <projectDescription> <name>commonjava-caching</name> - <comment> - </comment> + <comment>Entire package centered around an implementation of an aging cache (complete with proactively waiting grooming thread) which exposes an enhanced map interface to the user.</comment> <projects> </projects> <buildSpec> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-caching/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .classpath 15 Dec 2003 01:50:27 -0000 1.3 +++ .classpath 20 Feb 2004 21:17:01 -0000 1.4 @@ -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> @@ -11,6 +11,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-20 21:28:16
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-config-jndi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12241 Modified Files: .project project.xml .classpath Log Message: corrected versioning differences...everything is up to date. Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config-jndi/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .project 7 Oct 2003 19:40:40 -0000 1.2 +++ .project 20 Feb 2004 21:16:53 -0000 1.3 @@ -2,8 +2,7 @@ <projectDescription> <name>commonjava-config-jndi</name> - <comment> - </comment> + <comment>This project merely maintains a configuration set for JNDI environment parameters, along with an OPL parser library used to instantiate the configuration from namespaced XML.</comment> <projects> </projects> <buildSpec> Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config-jndi/project.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- project.xml 18 Feb 2004 06:12:17 -0000 1.7 +++ project.xml 20 Feb 2004 21:16:53 -0000 1.8 @@ -29,7 +29,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-lang</artifactId> - <version>2.0</version> + <version>2.0-1</version> <url>http://www.commonjava.org</url> </dependency> @@ -57,7 +57,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> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config-jndi/.classpath,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- .classpath 16 Jan 2004 02:20:24 -0000 1.5 +++ .classpath 20 Feb 2004 21:16:53 -0000 1.6 @@ -1,16 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <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-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-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-2.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-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 |
From: <joh...@co...> - 2004-02-20 21:28:09
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-hostaccess In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12215 Modified Files: project.xml .classpath .project Log Message: corrected versioning differences...everything is up to date. Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-hostaccess/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- project.xml 18 Feb 2004 06:12:00 -0000 1.5 +++ project.xml 20 Feb 2004 21:16:46 -0000 1.6 @@ -24,14 +24,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-1</version> + <version>2.1-5</version> <url>http://www.commonjava.org</url> </dependency> @@ -44,13 +44,6 @@ <dependency> <groupId>commonjava</groupId> - <artifactId>commonjava-lang</artifactId> - <version>2.0</version> - <url>http://www.commonjava.org</url> - </dependency> - - <dependency> - <groupId>commonjava</groupId> <artifactId>commonjava-reflection</artifactId> <version>2.0</version> <url>http://www.commonjava.org</url> @@ -59,7 +52,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-util</artifactId> - <version>2.0</version> + <version>2.0-3</version> <url>http://www.commonjava.org</url> </dependency> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-hostaccess/.classpath,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- .classpath 15 Dec 2003 01:50:12 -0000 1.5 +++ .classpath 20 Feb 2004 21:16:46 -0000 1.6 @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/java"> + <classpathentry kind="src" path="src\java"> </classpathentry> - <classpathentry output="target/test-classes" kind="src" path="src/test"> + <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 kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-lang-2.0-1.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-opl-2.1-1.jar"> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-opl-2.1-5.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.jar"> + <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="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-hostaccess/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .project 18 Sep 2003 00:57:08 -0000 1.1 +++ .project 20 Feb 2004 21:16:46 -0000 1.2 @@ -2,8 +2,7 @@ <projectDescription> <name>commonjava-hostaccess</name> - <comment> - </comment> + <comment>Contains a simple rule library and set of OPL parsers for specifying which hosts may access an application remotely. Supported specifications are IP ranges, single IP addresses, and CIDR-style network notations. These may be ANDed, ORed or NOTed to your heart's content, of course.</comment> <projects> </projects> <buildSpec> |
From: <joh...@co...> - 2004-02-20 21:28:01
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-watcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12135 Modified Files: project.xml .classpath .project Log Message: corrected versioning differences...everything is up to date. Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-watcher/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- project.xml 9 Jan 2004 05:17:14 -0000 1.1 +++ project.xml 20 Feb 2004 21:16:21 -0000 1.2 @@ -17,7 +17,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-lang</artifactId> - <version>2.0</version> + <version>2.0-1</version> <url>http://www.commonjava.org</url> </dependency> @@ -31,7 +31,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-config</artifactId> - <version>2.1</version> + <version>2.1-1</version> <url>http://www.commonjava.org</url> </dependency> @@ -52,7 +52,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> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-watcher/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .classpath 9 Jan 2004 05:17:14 -0000 1.1 +++ .classpath 20 Feb 2004 21:16:21 -0000 1.2 @@ -1,10 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <classpathentry kind="src" path="src/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-bgthreads-2.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-lang-2.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-config-2.1.jar"/> - <classpathentry kind="output" path="target/classes"/> -</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-1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-bgthreads-2.0.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="output" path="target\classes"> + </classpathentry> +</classpath> \ No newline at end of file Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-watcher/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .project 9 Jan 2004 05:17:14 -0000 1.1 +++ .project 20 Feb 2004 21:16:21 -0000 1.2 @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> - <name>commonjava-watcher</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-watcher</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 |
From: <joh...@co...> - 2004-02-20 21:27:36
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-peer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12107 Modified Files: .classpath Log Message: corrected versioning differences...everything is up to date. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-peer/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .classpath 15 Dec 2003 01:50:21 -0000 1.3 +++ .classpath 20 Feb 2004 21:16:14 -0000 1.4 @@ -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> @@ -19,6 +19,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-20 21:27:32
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-opl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12005 Modified Files: .classpath project.xml .project Added Files: maven.xml Log Message: corrected versioning differences...everything is up to date. --- 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="opl-test-src"/> <c:arg value="${basedir}/src/test"/> </c:invokeStatic> </preGoal> </project> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/.classpath,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- .classpath 18 Feb 2004 06:12:10 -0000 1.8 +++ .classpath 20 Feb 2004 21:16:04 -0000 1.9 @@ -1,13 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <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/commons-logging/jars/commons-logging-1.0.2.jar"/> - <classpathentry kind="src" path="/commonjava-io"/> - <classpathentry kind="src" path="/commonjava-lang"/> - <classpathentry kind="src" path="/commonjava-reflection"/> - <classpathentry kind="src" path="/commonjava-util"/> - <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-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="output" path="target\classes"> + </classpathentry> +</classpath> \ No newline at end of file Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/project.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- project.xml 18 Feb 2004 06:12:10 -0000 1.13 +++ project.xml 20 Feb 2004 21:16:04 -0000 1.14 @@ -51,7 +51,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-lang</artifactId> - <version>2.0</version> + <version>2.0-1</version> <url>http://www.commonjava.org</url> </dependency> @@ -72,7 +72,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> Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .project 18 Feb 2004 06:12:10 -0000 1.2 +++ .project 20 Feb 2004 21:16:04 -0000 1.3 @@ -1,22 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> - <name>commonjava-opl</name> - <comment> - </comment> - <projects> - <project>commonjava-io</project> - <project>commonjava-lang</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-opl</name> + <comment>In a drastically simple nutshell, OPL is an XML parser. It supports the notion of parser-per-element XML parsing, facilitating the construction of complex configurations and other types of objects from the parsed XML. OPL supports dynamic attribute resolution and packaged parser library definitions, both in the form of ParserLibrary implementation classes and in the form of XML definitions. In the latter case, OPL uses a specially-defined meta ParserLibrary and builds the actual parser library straight from the XML. The following is the algorithm: In this way, we can start parsing the object before the children are visited, and finish afterward. All NodeParsers have the ability to retrieve attribute values from the passed in ElementInfo object, and can lookup their parent parser via the getParent() or findAncestorWithClass() methods. Finally, if a NodeParser implementation also implements OPLModelRoot, this is meant to be the root node of the XML document, and contains the additional method getParsedObject(), which will return the result of the parsing effort. SAX and DOM are both supported via specific OPLDriver implementations; other XML parsers can also be supported by re-implementing this interface with specific code to use the other parser technology.</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 |
From: <joh...@co...> - 2004-02-20 21:27:28
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/java/org/commonjava/opl/generics/multifile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12005/src/java/org/commonjava/opl/generics/multifile Modified Files: ImportDirParser.java Log Message: corrected versioning differences...everything is up to date. Index: ImportDirParser.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/java/org/commonjava/opl/generics/multifile/ImportDirParser.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ImportDirParser.java 16 Jan 2004 01:37:33 -0000 1.5 +++ ImportDirParser.java 20 Feb 2004 21:16:04 -0000 1.6 @@ -8,6 +8,8 @@ import java.util.Iterator; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.commonjava.opl.DocumentDriver; import org.commonjava.opl.ElementInfo; import org.commonjava.opl.NodeParser; @@ -24,6 +26,8 @@ */ public class ImportDirParser extends NodeParser implements DirTuningParent { + private static final Log LOG = LogFactory.getLog(ImportDirParser.class); + private static final String DIRECTORY = "dir"; private Set inclusions = new HashSet(); @@ -64,6 +68,10 @@ } private String[] getFiles(String dir) { + if (LOG.isDebugEnabled()) { + LOG.debug("Looking for files to import in directory: " + dir); + } + OrLogicFilenameFilter includeFilter = new OrLogicFilenameFilter(); for (Iterator it = inclusions.iterator(); it.hasNext(); ) { @@ -83,6 +91,16 @@ allFilter.addFilter(excludeFilter); String[] files = FileFinder.getFileNames(dir, allFilter, true); + + + if (LOG.isDebugEnabled()) { + StringBuffer buffer = new StringBuffer("Found files to import:"); + for (int i = 0; i < files.length; i++) { + buffer.append("\n").append(files[i]); + } + LOG.debug(buffer.toString()); + } + return files; } @@ -90,9 +108,13 @@ for (int i = 0; i < files.length; i++) { String file = files[i]; + if (LOG.isDebugEnabled()) {LOG.debug("Parsing/importing file: " + file + " under element: " + getContext().getLastElement());} + DocumentDriver driver = new DocumentDriver(getParent()); BufferedInputStream in = new BufferedInputStream(new FileInputStream(file)); OPLEngine.getInstance(driver).parse(in); + + if (LOG.isDebugEnabled()) {LOG.debug("Parsed/imported file: " + file + " under element: " + getContext().getLastElement());} } } |
From: <joh...@co...> - 2004-02-20 21:27:27
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12005/src/test Modified Files: test4.xml test5.xml Log Message: corrected versioning differences...everything is up to date. Index: test4.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/test/test4.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- test4.xml 16 Jan 2004 01:37:33 -0000 1.3 +++ test4.xml 20 Feb 2004 21:16:04 -0000 1.4 @@ -3,7 +3,7 @@ <opl-test xmlns="opl:testlib" xmlns:imp="opl:import" bool="true" bool2="true" int="1" int2="1" long="2" long2="2" required="ok"> <prop:properties xmlns:prop="opl:properties"> - <imp:importDir dir="./src/test/imports"> + <imp:importDir dir="${opl-test-src}/imports"> <imp:include pattern=".+.xml"/> </imp:importDir> </prop:properties> Index: test5.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/test/test5.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- test5.xml 16 Jan 2004 01:37:33 -0000 1.3 +++ test5.xml 20 Feb 2004 21:16:04 -0000 1.4 @@ -3,7 +3,7 @@ <opl-test xmlns="opl:testlib" xmlns:imp="opl:import" bool="true" bool2="true" int="1" int2="1" long="2" long2="2" required="ok"> <prop:properties xmlns:prop="opl:properties"> - <imp:importDir dir="./src/test/imports2"> + <imp:importDir dir="${opl-test-src}/imports2"> <imp:include pattern=".+.xml"/> <imp:exclude pattern=".+exclude.xml"/> </imp:importDir> |
From: <joh...@co...> - 2004-02-20 21:27:27
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/test/org/commonjava/opl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12005/src/test/org/commonjava/opl Modified Files: DocumentDriverTest.java Log Message: corrected versioning differences...everything is up to date. Index: DocumentDriverTest.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/test/org/commonjava/opl/DocumentDriverTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- DocumentDriverTest.java 16 Jan 2004 01:37:13 -0000 1.7 +++ DocumentDriverTest.java 20 Feb 2004 21:16:04 -0000 1.8 @@ -28,6 +28,7 @@ } public void testParseUri() throws ParseException{ + System.out.println("Test 1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>"); try { DocumentDriver driver = new DocumentDriver(); OPLEngine engine = OPLEngine.getInstance(driver); @@ -49,9 +50,11 @@ System.out.flush(); fail(e.getMessage()); } + System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 1"); } public void testParseUri2(){ + System.out.println("Test 2 >>>>>>>>>>>>>>>>>>>>>>>>>>>>"); try { DocumentDriver driver = new DocumentDriver(); OPLEngine engine = OPLEngine.getInstance(driver); @@ -73,9 +76,11 @@ System.out.flush(); fail(e.getMessage()); } + System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 2"); } public void testParseUri3(){ + System.out.println("Test 3 >>>>>>>>>>>>>>>>>>>>>>>>>>>>"); try { DocumentDriver driver = new DocumentDriver(); OPLEngine engine = OPLEngine.getInstance(driver); @@ -101,9 +106,11 @@ System.out.flush(); fail(e.getMessage()); } + System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 3"); } public void testParseUri4(){ + System.out.println("Test 4 >>>>>>>>>>>>>>>>>>>>>>>>>>>>"); try { DocumentDriver driver = new DocumentDriver(); OPLEngine engine = OPLEngine.getInstance(driver); @@ -130,9 +137,11 @@ System.out.flush(); fail(e.getMessage()); } + System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 4"); } public void testParseUri5(){ + System.out.println("Test 5 >>>>>>>>>>>>>>>>>>>>>>>>>>>>"); try { DocumentDriver driver = new DocumentDriver(); OPLEngine engine = OPLEngine.getInstance(driver); @@ -160,9 +169,11 @@ System.out.flush(); fail(e.getMessage()); } + System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 5"); } public void testParseUri6(){ + System.out.println("Test 6 >>>>>>>>>>>>>>>>>>>>>>>>>>>>"); try { GenericNamespaceResolver resolver = new GenericNamespaceResolver(); resolver.addAlias("http://www.commonjava.org/schema/test", "opl:testlib"); @@ -189,9 +200,11 @@ System.out.flush(); fail(e.getMessage()); } + System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 6"); } public void testParseUri7(){ + System.out.println("Test 7 >>>>>>>>>>>>>>>>>>>>>>>>>>>>"); try { DocumentDriver driver = new DocumentDriver(); OPLEngine engine = OPLEngine.getInstance(driver); @@ -206,6 +219,7 @@ e.printStackTrace(); fail("Parse of test7.xml failed."); } + System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 7"); } } |
From: <joh...@co...> - 2004-02-20 21:27:26
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/java/org/commonjava/opl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12005/src/java/org/commonjava/opl Modified Files: NodeParser.java Log Message: corrected versioning differences...everything is up to date. Index: NodeParser.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/java/org/commonjava/opl/NodeParser.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- NodeParser.java 18 Feb 2004 06:12:10 -0000 1.14 +++ NodeParser.java 20 Feb 2004 21:16:03 -0000 1.15 @@ -3,6 +3,8 @@ */ package org.commonjava.opl; +import java.io.PrintWriter; +import java.io.StringWriter; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -10,6 +12,8 @@ import java.util.Properties; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.commonjava.opl.generics.properties.PropertiesContainer; import org.commonjava.util.LookupHelper; import org.commonjava.util.Strings; @@ -23,6 +27,8 @@ */ public abstract class NodeParser { + private static final Log LOG = LogFactory.getLog(NodeParser.class); + private NodeParser parent; private OPLContext context; private ParserLibrary library; @@ -407,6 +413,17 @@ */ protected final Properties getAccumulatedProperties(){ buildMergedProperties(); +// JUST TOO VERBOSE, EVEN FOR DEBUGGING! +// if (LOG.isDebugEnabled()) { +// StringWriter sout = new StringWriter(); +// PrintWriter out = new PrintWriter(sout); +// out.println("Merged Properties:"); +// mergedProperties.list(out); +// out.println(); +// out.flush(); +// +// LOG.debug(sout.getBuffer().toString()); +// } return mergedProperties; } @@ -419,18 +436,29 @@ // will drag on and on... // if(mergedProperties == null){ if(parent != null){ + if (LOG.isDebugEnabled()) { + LOG.debug("Parent not null. Gathering accumulated properties from parent: " + getParent()); + } mergedProperties = parent.getAccumulatedProperties(); } else{ + if (LOG.isDebugEnabled()) { + LOG.debug("Parent is null. Using System Properties as the upstream accumulated properties."); + } + mergedProperties = new Properties(System.getProperties()); } if(this instanceof PropertiesContainer){ + if (LOG.isDebugEnabled()) { + LOG.debug("I (" + getClass().getName() + ") am a PropertiesContainer. Retrieving my properties, and merging with upstream accumulated."); + } Properties myProps = ((PropertiesContainer)this).getProperties(); if(myProps != null){ mergedProperties.putAll(myProps); } } + // } } } |
From: <joh...@co...> - 2004-02-20 21:27:09
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-config-crypto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11974 Modified Files: project.xml .classpath .project Log Message: corrected versioning differences...everything is up to date. Index: project.xml =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config-crypto/project.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- project.xml 18 Feb 2004 06:12:54 -0000 1.9 +++ project.xml 20 Feb 2004 21:15:46 -0000 1.10 @@ -22,7 +22,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-lang</artifactId> - <version>2.0</version> + <version>2.0-1</version> <url>http://www.commonjava.org</url> </dependency> @@ -36,21 +36,21 @@ <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> <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> <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-config</artifactId> - <version>2.1</version> + <version>2.1-1</version> <url>http://www.commonjava.org</url> </dependency> @@ -65,7 +65,7 @@ <dependency> <groupId>commonjava</groupId> <artifactId>commonjava-util</artifactId> - <version>2.0-2</version> + <version>2.0-3</version> <type>test</type> <url>http://www.commonjava.org</url> </dependency> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config-crypto/.classpath,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- .classpath 16 Jan 2004 02:20:09 -0000 1.7 +++ .classpath 20 Feb 2004 21:15:46 -0000 1.8 @@ -1,16 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <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-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-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-2.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-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-util-2.0-3.jar"> + </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-config-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-1.0.1.jar"> + </classpathentry> + <classpathentry kind="output" path="target\classes"> + </classpathentry> +</classpath> \ No newline at end of file Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-config-crypto/.project,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- .project 15 Dec 2003 01:49:36 -0000 1.4 +++ .project 20 Feb 2004 21:15:46 -0000 1.5 @@ -2,8 +2,7 @@ <projectDescription> <name>commonjava-config-crypto</name> - <comment> - </comment> + <comment>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.</comment> <projects> </projects> <buildSpec> |
From: <joh...@co...> - 2004-02-20 21:27:03
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-runtime In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11921 Modified Files: .classpath Log Message: corrected versioning differences...everything is up to date. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-runtime/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .classpath 15 Dec 2003 01:50:08 -0000 1.2 +++ .classpath 20 Feb 2004 21:15:37 -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> @@ -13,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-20 21:26:53
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-ore-spi-db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11784 Modified Files: .classpath Log Message: corrected versioning differences...everything is up to date. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-ore-spi-db/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .classpath 15 Dec 2003 01:49:52 -0000 1.2 +++ .classpath 20 Feb 2004 21:15:16 -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> @@ -21,6 +21,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-20 21:26:29
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-ore-spi-ldap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11748 Modified Files: .classpath Log Message: corrected versioning differences...everything is up to date. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-ore-spi-ldap/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .classpath 15 Dec 2003 01:50:07 -0000 1.3 +++ .classpath 20 Feb 2004 21:15:07 -0000 1.4 @@ -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> @@ -19,6 +19,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-20 21:26:22
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-math In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11651 Modified Files: .classpath .project Log Message: corrected versioning differences...everything is up to date. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-math/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .classpath 15 Dec 2003 01:50:13 -0000 1.2 +++ .classpath 20 Feb 2004 21:15:00 -0000 1.3 @@ -1,12 +1,12 @@ <?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> <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 Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-math/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .project 18 Sep 2003 01:21:07 -0000 1.1 +++ .project 20 Feb 2004 21:15:00 -0000 1.2 @@ -2,8 +2,7 @@ <projectDescription> <name>commonjava-math</name> - <comment> - </comment> + <comment>Provides some higher-level math functionality. Currently only provides variance and standard deviation, in support of the Binary Diff project.</comment> <projects> </projects> <buildSpec> |
From: <joh...@co...> - 2004-02-20 21:26:16
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11616 Modified Files: .classpath .project Log Message: corrected versioning differences...everything is up to date. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-lang/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .classpath 15 Dec 2003 01:50:16 -0000 1.3 +++ .classpath 20 Feb 2004 21:14:53 -0000 1.4 @@ -1,12 +1,12 @@ <?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> <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 Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-lang/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .project 18 Sep 2003 01:10:42 -0000 1.1 +++ .project 20 Feb 2004 21:14:53 -0000 1.2 @@ -2,8 +2,7 @@ <projectDescription> <name>commonjava-lang</name> - <comment> - </comment> + <comment>Attempts to provide some commonplace language constructs for use in modeling. Examples include a base set of identifier classes, along with interface definitions and support classes for object locking, validation, reversibility, and negation.</comment> <projects> </projects> <buildSpec> |
From: <joh...@co...> - 2004-02-20 21:26:03
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-txlate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11568 Modified Files: .classpath Log Message: corrected versioning differences...everything is up to date. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-txlate/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .classpath 15 Dec 2003 01:51:18 -0000 1.3 +++ .classpath 20 Feb 2004 21:14:37 -0000 1.4 @@ -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> @@ -15,6 +15,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-20 21:25:47
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-ore In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11519 Modified Files: .classpath Log Message: corrected versioning differences...everything is up to date. Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-ore/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .classpath 15 Dec 2003 01:49:56 -0000 1.3 +++ .classpath 20 Feb 2004 21:14:24 -0000 1.4 @@ -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> @@ -19,6 +19,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-20 21:25:38
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-dirdigester In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11477 Modified Files: .project .classpath Log Message: corrected versioning differences...everything is up to date. Index: .project =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-dirdigester/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .project 2 Feb 2004 07:03:52 -0000 1.2 +++ .project 20 Feb 2004 21:14:15 -0000 1.3 @@ -2,8 +2,7 @@ <projectDescription> <name>commonjava-dirdigester</name> - <comment> - </comment> + <comment>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.</comment> <projects> </projects> <buildSpec> Index: .classpath =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-dirdigester/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .classpath 2 Feb 2004 07:03:52 -0000 1.2 +++ .classpath 20 Feb 2004 21:14:15 -0000 1.3 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/java"> + <classpathentry kind="src" path="src\java"> </classpathentry> - <classpathentry output="target/test-classes" kind="src" path="src/test"> + <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> @@ -13,6 +13,6 @@ </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-util-2.0-3.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-20 21:25:32
|
Update of /cvsroot/commonjava/commonjava-projects/commonjava-diff/src/test/org/commonjava/diff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11430/src/test/org/commonjava/diff Modified Files: DiffEngineTest.java Log Message: corrected versioning differences...everything is up to date. Index: DiffEngineTest.java =================================================================== RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-diff/src/test/org/commonjava/diff/DiffEngineTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- DiffEngineTest.java 17 Jan 2004 04:12:47 -0000 1.1 +++ DiffEngineTest.java 20 Feb 2004 21:14:08 -0000 1.2 @@ -77,11 +77,12 @@ { System.out.println("test for DiffOperation[] compute(ReadableByteChannel, ReadableByteChannel) with real files."); - FileInputStream in1 = new FileInputStream("./src/test/DiffEngineTest.cls"); + String srcDir = System.getProperty("diff-test-src", "./src/test"); + FileInputStream in1 = new FileInputStream(srcDir + "/DiffEngineTest.cls"); FileChannel inChannel1 = in1.getChannel(); MappedByteBuffer map1 = inChannel1.map(FileChannel.MapMode.READ_ONLY, 0, inChannel1.size()); - FileInputStream in2 = new FileInputStream("./src/test/DiffEngineTest2.cls"); + FileInputStream in2 = new FileInputStream(srcDir + "/DiffEngineTest2.cls"); FileChannel inChannel2 = in2.getChannel(); MappedByteBuffer map2 = inChannel2.map(FileChannel.MapMode.READ_ONLY, 0, inChannel2.size()); @@ -103,11 +104,12 @@ { System.out.println("test for DiffOperation[] compute(ReadableByteChannel, ReadableByteChannel) with real files."); - FileInputStream in1 = new FileInputStream("./src/test/developer-nirvana-notes.sxw"); + String srcDir = System.getProperty("diff-test-src", "./src/test"); + FileInputStream in1 = new FileInputStream(srcDir + "/developer-nirvana-notes.sxw"); FileChannel inChannel1 = in1.getChannel(); MappedByteBuffer map1 = inChannel1.map(FileChannel.MapMode.READ_ONLY, 0, inChannel1.size()); - FileInputStream in2 = new FileInputStream("./src/test/developer-nirvana-notes2.sxw"); + FileInputStream in2 = new FileInputStream(srcDir + "/developer-nirvana-notes2.sxw"); FileChannel inChannel2 = in2.getChannel(); MappedByteBuffer map2 = inChannel2.map(FileChannel.MapMode.READ_ONLY, 0, inChannel2.size()); |