cvs commit: jakarta-commons-sandbox/graph2/src/java/org/apache/commons/graph/domain/uml/exception ModelNotFoundException.java
jvanzyl 2003/02/18 06:44:51 Modified:graph2 project.xml Removed: graph2/src/java/org/apache/commons/graph/domain/uml ModelFactory.java StateMachineFactory.java graph2/src/java/org/apache/commons/graph/domain/uml/exception ModelNotFoundException.java Log: o Removing dep on nsuml. Revision ChangesPath 1.15 +0 -5 jakarta-commons-sandbox/graph2/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/graph2/project.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- project.xml 1 Jan 2003 06:55:20 - 1.14 +++ project.xml 18 Feb 2003 14:44:51 - 1.15 @@ -81,11 +81,6 @@ /dependency dependency - idnsuml/id - version0.4.20/version -/dependency - -dependency idcommons-collections/id version2.1/version /dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/graph2 build.xml gump.xml
jvanzyl 2003/02/18 06:45:49
Modified:graph2 build.xml gump.xml
Log:
o updating gump and ant descriptors.
Revision ChangesPath
1.4 +122 -143 jakarta-commons-sandbox/graph2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons-sandbox/graph2/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2 Jan 2003 13:57:55 - 1.3
+++ build.xml 18 Feb 2003 14:45:49 - 1.4
@@ -1,186 +1,165 @@
?xml version=1.0 encoding=UTF-8?
+!--
+ build.xml generated by maven from project.xml version 0.8.1
+ on date February 18 2003, time 0945
+--
+
project default=jar name=commons-graph basedir=.
-
- property name=defaulttargetdir value=target/property
- property name=classesdir value=target/classes/property
- property name=testclassesdir value=target/test-classes/property
- property name=testreportdir value=target/test-reports/property
-
-
-
-
-
-
-
-
-
-
- property name=resourcedir value=./property
-
- property name=distdir value=dist/property
- property name=javadocdir value=target/docs/apidocs/property
- property name=final.name value=commons-graph-0.8.1/property
-
+ property name=defaulttargetdir value=target
+ /property
+ property name=libdir value=target/lib
+ /property
+ property name=classesdir value=target/classes
+ /property
+ property name=testclassesdir value=target/test-classes
+ /property
+ property name=testreportdir value=target/test-reports
+ /property
+ property name=distdir value=dist
+ /property
+ property name=javadocdir value=dist/docs/api
+ /property
+ property name=final.name value=commons-graph-0.8.1
+ /property
target name=init description=o Initializes some properties
-mkdir dir=lib/mkdir
+mkdir dir=${libdir}
+/mkdir
condition property=noget
- equals arg2=only arg1=${build.sysclasspath}/equals
+ equals arg2=only arg1=${build.sysclasspath}
+ /equals
/condition
/target
-
target name=compile description=o Compile the code depends=get-deps
-
-mkdir dir=${classesdir}/mkdir
-
+mkdir dir=${classesdir}
+/mkdir
javac destdir=${classesdir} deprecation=true debug=true optimize=false
excludes=**/package.html
src
-pathelement location=src/java/pathelement
+pathelement location=src/java
+/pathelement
/src
classpath
-fileset dir=lib
- include name=*.jar/include
+fileset dir=${libdir}
+ include name=*.jar
+ /include
/fileset
/classpath
/javac
-
-
-
-
-
-
/target
-
target name=jar description=o Create the jar depends=compile,test
-
-jar jarfile=target/${final.name}.jar excludes=**/package.html
basedir=${classesdir}/jar
-
+jar jarfile=target/${final.name}.jar excludes=**/package.html
basedir=${classesdir}
+/jar
/target
-
target name=clean description=o Clean up the generated directories
-delete dir=${defaulttargetdir}/delete
-delete dir=${distdir}/delete
+delete dir=${defaulttargetdir}
+/delete
+delete dir=${distdir}
+/delete
/target
-
target name=dist description=o Create a distribution depends=jar, javadoc
-mkdir dir=dist/mkdir
+mkdir dir=dist
+/mkdir
copy todir=dist
- fileset dir=${defaulttargetdir}/fileset
+ fileset dir=${defaulttargetdir} includes=*.jar
+ /fileset
+ fileset dir=${basedir} includes=LICENSE*, README*
+ /fileset
/copy
/target
-
target name=test description=o Run the test cases if=test.failure
depends=internal-test
-fail message=There were test failures./fail
+fail message=There were test failures.
+/fail
/target
target name=internal-test depends=compile-tests
-
- mkdir dir=${testreportdir}/mkdir
- junit dir=./ failureproperty=test.failure printSummary=yes fork=true
haltonerror=true
-
-sysproperty key=basedir value=./sysproperty
-formatter type=xml/formatter
-formatter usefile=true type=plain/formatter
-classpath
- fileset dir=lib
-include name=*.jar/include
- /fileset
- pathelement path=${testclassesdir}/pathelement
- pathelement path=${classesdir}/pathelement
-/classpath
-batchtest todir=${testreportdir}
- fileset dir=src/test
-
- include name=**/*Test.java/include
-
-
-
-
-
- /fileset
cvs commit: jakarta-commons-sandbox/graph2 project.xml
jvanzyl 2003/02/18 06:46:40 Modified:graph2 project.xml Log: uo updating version after removal of nsuml. Revision ChangesPath 1.16 +1 -1 jakarta-commons-sandbox/graph2/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/graph2/project.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- project.xml 18 Feb 2003 14:44:51 - 1.15 +++ project.xml 18 Feb 2003 14:46:40 - 1.16 @@ -4,7 +4,7 @@ pomVersion3/pomVersion idcommons-graph/id nameGraph/name - currentVersion0.8.1/currentVersion + currentVersion0.8.2/currentVersion organization nameApache Software Foundation/name - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/lang project.xml
jvanzyl 2003/02/02 16:01:08 Modified:lang project.xml Log: o The CalendUtilsTest fails due to what appears to be some TZ problems. I'm right on the cusp for the last Sunday the test is trying to find and it gets the wrong day. Excluding it for now from the test because the test is not reliable yet. Revision ChangesPath 1.10 +1 -0 jakarta-commons/lang/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/lang/project.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- project.xml 2 Feb 2003 09:11:55 - 1.9 +++ project.xml 3 Feb 2003 00:01:07 - 1.10 @@ -99,6 +99,7 @@ /includes excludes exclude**/Abstract*.java/exclude +exclude**/*CalendarUtils*.java/exclude /excludes /unitTest /build - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/discovery project.xml
jvanzyl 2003/01/07 21:24:31
Modified:discovery project.xml
Log:
o these changes gives the layout of the test resources i believe we
are looking for. the test still fail so i believe it's a forehead
interaction quirk. hunting down now.
.
|-- META-INF
| -- services
| -- org.apache.commons.discovery.test.TestInterface2
|-- org
| -- apache
| -- commons
| -- discovery
| -- test
| |-- TestAll.class
| |-- TestImpl1_1.class
| |-- TestImpl1_2.class
| |-- TestImpl2_1.class
| |-- TestImpl2_2.class
| |-- TestInterface.properties
| |-- TestInterface1.class
| -- TestInterface2.class
|-- test
| -- testResource
|-- testAlt1
| -- testResource
-- testAlt2
-- testResource
Revision ChangesPath
1.12 +7 -12 jakarta-commons/discovery/project.xml
Index: project.xml
===
RCS file: /home/cvs/jakarta-commons/discovery/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 8 Jan 2003 04:36:17 - 1.11
+++ project.xml 8 Jan 2003 05:24:31 - 1.12
@@ -62,24 +62,19 @@
resources
resource
directory${basedir}/src/directory
- includesinclude**/testResource/include/includes
+ includes
+include**/testResource/include
+ /includes
/resource
resource
directory${basedir}/src/test/directory
- excludes
-exclude**/*.java/exclude
- /excludes
+ includes
+include**/*.properties/include
+includeMETA-INF/**/include
+ /includes
/resource
/resources
/unitTest
-
-resources
- resource
-includes
- include**/*.properties/include
-/includes
- /resource
-/resources
/build
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/werkz example.jelly
jvanzyl 2002/12/30 23:38:29 Modified:jellyproject.xml jelly/src/java/org/apache/commons/jelly jelly.properties jelly/src/java/org/apache/commons/jelly/tags/jeez JeezTagLibrary.java TargetTag.java Removed: jelly/src/java/org/apache/commons/jelly/tags/werkz AttainGoalTag.java AttainTag.java CallbackTagSupport.java GoalTag.java JellyBuildListener.java JellySession.java PostActionTag.java PostGoalTag.java PreActionTag.java PreGoalTag.java ProjectTag.java UseGoalsTag.java WerkzTagLibrary.java WerkzTagSupport.java package.html jelly/src/test/org/apache/commons/jelly/werkz example.jelly Log: o Moving Werkz jelly tags into in Werkz itself. During some Maven refactoring it became obvious that the Werkz tags don't belong in Jelly as testing took forever because everything is together. Definitely have some ideas for some busting up in Jelly land. Revision ChangesPath 1.103 +3 -1 jakarta-commons-sandbox/jelly/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- project.xml 18 Dec 2002 15:27:50 - 1.102 +++ project.xml 31 Dec 2002 07:38:29 - 1.103 @@ -335,7 +335,7 @@ !-- used by werkz library -- dependency idwerkz/id - version1.0-beta-4/version + version1.0-beta-5/version /dependency dependency @@ -536,6 +536,8 @@ include**/*.xsl/include include**/*.rng/include include**/*.dtd/include + include**/*.properties/include + include**/*.html/include /includes /resource /resources 1.31 +0 -1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/jelly.properties Index: jelly.properties === RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/jelly.properties,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- jelly.properties 18 Dec 2002 15:27:50 - 1.30 +++ jelly.properties 31 Dec 2002 07:38:29 - 1.31 @@ -6,7 +6,6 @@ jsl = org.apache.commons.jelly.tags.jsl.JSLTagLibrary ant = org.apache.commons.jelly.tags.ant.AntTagLibrary log = org.apache.commons.jelly.tags.log.LogTagLibrary -werkz = org.apache.commons.jelly.tags.werkz.WerkzTagLibrary jeez = org.apache.commons.jelly.tags.jeez.JeezTagLibrary util= org.apache.commons.jelly.tags.util.UtilTagLibrary junit= org.apache.commons.jelly.tags.junit.JUnitTagLibrary 1.12 +7 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jeez/JeezTagLibrary.java Index: JeezTagLibrary.java === RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jeez/JeezTagLibrary.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- JeezTagLibrary.java 11 Dec 2002 12:41:00 - 1.11 +++ JeezTagLibrary.java 31 Dec 2002 07:38:29 - 1.12 @@ -62,13 +62,14 @@ package org.apache.commons.jelly.tags.jeez; +import com.werken.werkz.jelly.WerkzTagLibrary; + import org.apache.commons.jelly.Tag; import org.apache.commons.jelly.TagLibrary; import org.apache.commons.jelly.impl.DynamicTagLibrary; import org.apache.commons.jelly.impl.TagFactory; import org.apache.commons.jelly.impl.TagScript; import org.apache.commons.jelly.tags.ant.AntTagLibrary; -import org.apache.commons.jelly.tags.werkz.WerkzTagLibrary; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.xml.sax.Attributes; 1.4 +6 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jeez/TargetTag.java Index: TargetTag.java === RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jeez/TargetTag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TargetTag.java30 Oct 2002 19:16:20 - 1.3 +++ TargetTag.java
cvs commit: jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy TestDefaultPluralStemmer.java
jvanzyl 2002/09/20 07:00:41
Modified:betwixt maven.xml
betwixt/src/java/org/apache/commons/betwixt/strategy
DefaultPluralStemmer.java
betwixt/src/test/org/apache/commons/betwixt/strategy
TestDefaultPluralStemmer.java
Log:
o Applying patch provided by John Thorhauer:
I have a patch for betwixt. The problem that I am having is with the
DefaultPluralStemmer. It does not deal real well with plurals that end
in 'es'. I have included a patch for both the test case and the patch
for the DefaultPluralStemmer. If you run the test without applying the
fix you will see the problem.
Revision ChangesPath
1.4 +2 -2 jakarta-commons/betwixt/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/jakarta-commons/betwixt/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 12 Aug 2002 19:29:15 - 1.3
+++ maven.xml 20 Sep 2002 14:00:41 - 1.4
@@ -4,8 +4,8 @@
echoCopying test resources .../echo
-copy todir=target/test-classes/org/apache/commons/betwixt/nowrap
- fileset dir=src/test/org/apache/commons/betwixt/nowrap
+copy todir=${basedir}/target/test-classes/org/apache/commons/betwixt/nowrap
+ fileset dir=${basedir}/src/test/org/apache/commons/betwixt/nowrap
include name=*.betwixt/
include name=*.xml/
/fileset
1.3 +11 -6
jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/strategy/DefaultPluralStemmer.java
Index: DefaultPluralStemmer.java
===
RCS file:
/home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/strategy/DefaultPluralStemmer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultPluralStemmer.java 11 Jun 2002 16:05:21 - 1.2
+++ DefaultPluralStemmer.java 20 Sep 2002 14:00:41 - 1.3
@@ -90,6 +90,11 @@
int foundKeyCount = 0;
String keyFound = null;
ElementDescriptor answer = (ElementDescriptor) map.get( propertyName + s
);
+
+if ( answer == null !propertyName.endsWith( y )) {
+answer = (ElementDescriptor) map.get( propertyName + es );
+}
+
if ( answer == null ) {
int length = propertyName.length();
if ( propertyName.endsWith( y ) length 1 ) {
@@ -126,7 +131,7 @@
}
}
if (foundKeyCount 1) {
-log.warn(More then one type matches, using closest match +keyFound);
+log.warn(More than one type matches, using closest match +keyFound);
}
return answer;
1.2 +31 -7
jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy/TestDefaultPluralStemmer.java
Index: TestDefaultPluralStemmer.java
===
RCS file:
/home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/strategy/TestDefaultPluralStemmer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestDefaultPluralStemmer.java 11 Jun 2002 16:05:21 - 1.1
+++ TestDefaultPluralStemmer.java 20 Sep 2002 14:00:41 - 1.2
@@ -151,7 +151,7 @@
ElementDescriptor result = dps.findPluralDescriptor(y, map);
assertEquals(des, result);
}
-
+
/**
* Tests to see if you get warned when there are multiple matches
* found
@@ -178,7 +178,31 @@
result = dps.findPluralDescriptor(yesno, map);
assertEquals(desyesno, result);
}
-
+
+/**
+ * Test to find matched where plural ending is es
+ */
+public void testESPluralEndingMatch() {
+HashMap map = new HashMap();
+
+ElementDescriptor index = new ElementDescriptor(index, index,);
+map.put(index, index);
+ElementDescriptor indexes = new ElementDescriptor(indexes, indexes,);
+map.put(indexes, indexes);
+
+ElementDescriptor patch = new ElementDescriptor(patch, patch,);
+map.put(patch, patch);
+ElementDescriptor patches = new ElementDescriptor(patches, patches,);
+map.put(patches, patches);
+
+DefaultPluralStemmer stemmer = new DefaultPluralStemmer();
+ElementDescriptor result = stemmer.findPluralDescriptor(index, map);
+assertEquals(indexes, result);
+
+result = stemmer.findPluralDescriptor(patches, map);
+assertEquals(patches, result);
+}
+
/**
* Test if the closest match mechanisme is working
*/
--
To unsubscribe, e-mail: mailto
cvs commit: jakarta-commons-sandbox/sql/src/test-input datamodel.xml
jvanzyl 2002/09/20 13:34:38
Modified:sql/src/java/org/apache/commons/sql/builder SqlBuilder.java
sql/src/java/org/apache/commons/sql/model Table.java
sql/src/test/org/apache/commons/sql
TestDataModelRoundTrip.java
sql/src/test/org/apache/commons/sql/builder TestBuilder.java
sql/src/test-input datamodel.xml
Log:
o Applying John Thorhauer's patches for Postgresql:
I have attatched a file that includes the patches that add support for
Postgres and indexes along with unit tests for the commons-sql package.
Revision ChangesPath
1.8 +76 -0
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/SqlBuilder.java
Index: SqlBuilder.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/SqlBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SqlBuilder.java 16 Sep 2002 14:50:19 - 1.7
+++ SqlBuilder.java 20 Sep 2002 20:34:38 - 1.8
@@ -69,6 +69,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.sql.model.Index;
+import org.apache.commons.sql.model.IndexColumn;
import org.apache.commons.sql.model.Column;
import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.model.ForeignKey;
@@ -109,6 +111,9 @@
/** Whether or not foreign key constraints are embedded inside the create table
statement */
private boolean foreignKeysEmbedded;
+/** Whether or not indexes are embedded inside the create table statement */
+private boolean indexesEmbedded;
+
/** Should foreign key constraints be explicitly named */
private boolean foreignKeyConstraintsNamed;
@@ -201,6 +206,9 @@
if (isForeignKeysEmbedded()) {
writeForeignKeys(table);
}
+if (isIndexesEmbedded()) {
+writeEmbeddedIndexes(table);
+}
println();
print());
printEndOfStatement();
@@ -211,6 +219,9 @@
if (!isForeignKeysEmbedded()) {
writeForeignKeysAlterTable(table);
}
+if (!isIndexesEmbedded()) {
+writeIndexes(table);
+}
}
/**
@@ -302,7 +313,23 @@
this.foreignKeysEmbedded = foreignKeysEmbedded;
}
+/**
+ * @return whether the indexes are embedded in the create
+ * table clause or as seperate statements.
+ * The default is false.
+ */
+public boolean isIndexesEmbedded() {
+return indexesEmbedded;
+}
+/**
+ * Sets whether the indexes are embedded in the create
+ * table clause or as seperate statements.
+ * The default is false.
+ */
+public void setIndexesEmbedded(boolean indexesEmbedded) {
+this.indexesEmbedded = indexesEmbedded;
+}
/**
* Returns whether foreign key constraints should be named when they are
embedded inside
@@ -504,6 +531,55 @@
printEndOfStatement();
}
}
+}
+
+/**
+ * Writes the indexes.
+ */
+protected void writeIndexes(Table table) throws IOException{
+for (Iterator indexIter = table.getIndexes().iterator();
+indexIter.hasNext();
+) {
+Index index = (Index) indexIter.next();
+if (index.getName() == null) {
+log.warn( Index Name is null for index: + index);
+}
+else {
+print(CREATE INDEX );
+print(index.getName());
+print( ON );
+print(table.getName());
+
+print( ();
+
+for (Iterator idxColumnIter = index.getIndexColumns().iterator();
+idxColumnIter.hasNext();
+)
+{
+IndexColumn idxColumn = (IndexColumn)idxColumnIter.next();
+if (idxColumnIter.hasNext())
+{
+print(idxColumn.getName() + , );
+}
+else
+{
+print(idxColumn.getName());
+}
+}
+
+print());
+printEndOfStatement();
+}
+}
+}
+
+
+/**
+ * Writes the indexes embedded within the create table statement. not
+ * yet implemented
+ */
+protected void writeEmbeddedIndexes(Table table) throws IOException
+{
}
/**
1.5 +17 -0
jakarta-commons
cvs commit: jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model Index.java IndexColumn.java
jvanzyl 2002/09/20 13:50:52
Added: sql/src/java/org/apache/commons/sql/builder
PostgreSqlBuilder.java
sql/src/java/org/apache/commons/sql/model Index.java
IndexColumn.java
Log:
o Adding new files created by the patch John submitted. Forgot to add
them.
Revision ChangesPath
1.1
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/PostgreSqlBuilder.java
Index: PostgreSqlBuilder.java
===
/*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Commons, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
* $Id: PostgreSqlBuilder.java,v 1.1 2002/09/20 20:50:51 jvanzyl Exp $
*/
package org.apache.commons.sql.builder;
import java.io.IOException;
/**
* An SQL Builder for PostgresSqlL
*
* @author a href=mailto:[EMAIL PROTECTED];John Thorhauer/a
* @version $Revision: 1.1 $
*/
public class PostgreSqlBuilder extends SqlBuilder{
public PostgreSqlBuilder()
{
}
protected void printAutoIncrementColumn() throws IOException {
print( DEFAULT NEXTVAL('serial') );
}
}
1.1
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/Index.java
Index: Index.java
===
/*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement
cvs commit: jakarta-commons-sandbox/jrcs project.xml
jvanzyl 2002/06/05 04:01:25 Modified:jrcs project.xml Log: More updates to the POM. Revision ChangesPath 1.3 +6 -2 jakarta-commons-sandbox/jrcs/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/jrcs/project.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- project.xml 5 Jun 2002 10:41:54 - 1.2 +++ project.xml 5 Jun 2002 11:01:25 - 1.3 @@ -19,11 +19,15 @@ /description urlhttp://jakarta.apache.org/commons/jrcs/url - cvsWebUrlhttp://cvs.apache.org/viewcvs/jakarta/jakarta-commons-sandbox/jrcs//cvsWebUrl issueTrackingUrlhttp://nagoya.apache.org:8080/scarab/servlet/scarab//issueTrackingUrl siteAddressjakarta.apache.org/siteAddress siteDirectory/www/jakarta.apache.org/turbine/maven//siteDirectory - distributionDirectory/www/jakarta.apache.org/builds/jakarta-turbine-maven//distributionDirectory + distributionDirectory/www/jakarta.apache.org/builds/commons/jrcs/distributionDirectory + + repository + connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/connection +urlhttp://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jrcs/url + /repository mailingLists mailingList -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/jrcs project.xml
jvanzyl 2002/06/05 04:03:29 Modified:jrcs project.xml Log: Once again. Revision ChangesPath 1.4 +1 -3 jakarta-commons-sandbox/jrcs/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/jrcs/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 5 Jun 2002 11:01:25 - 1.3 +++ project.xml 5 Jun 2002 11:03:29 - 1.4 @@ -61,10 +61,8 @@ dependencies dependency - namejakarta-oro/name - typerequired/type + idjakarta-oro/id version1.3/version - jaroro.jar/jar urlhttp://jakarta.apache.org/oro//url /dependency -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/configuration project.xml
jvanzyl 2002/06/05 04:04:31 Modified:configuration project.xml Log: Updating POM for the b4 release of Maven. Revision ChangesPath 1.6 +10 -15jakarta-commons-sandbox/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/configuration/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 11 May 2002 14:47:11 - 1.5 +++ project.xml 5 Jun 2002 11:04:31 - 1.6 @@ -1,7 +1,7 @@ ?xml version=1.0? project - version2/version + pomVersion3/pomVersion namecommons-configuration/name idcommons-configuration/id currentVersion1.0-dev/currentVersion @@ -20,13 +20,16 @@ /description urlhttp://jakarta.apache.org/commons/sandbox/configuration//url - cvsWebUrlhttp://cvs.apache.org/viewcvs/jakarta-commons-sandbox/configuration//cvsWebUrl - cvsModulejakarta-commons-sandbox/configuration/cvsModule issueTrackingUrlhttp://nagoya.apache.org/scarab/servlet/scarab//issueTrackingUrl siteAddressjakarta.apache.org/siteAddress siteDirectory/www/jakarta.apache.org/commons/sandbox/configuration//siteDirectory distributionDirectory/www/jakarta.apache.org/builds/jakarta-commons-sandbox//distributionDirectory + repository + connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/connection +urlhttp://cvs.apache.org/viewcvs/jakarta-commons-sandbox/configuration//url + /repository + branches /branches @@ -68,31 +71,23 @@ dependency namecommons-collections/name - typerequired/type - version1.0/version - jarcommons-collections.jar/jar + version2.0/version /dependency dependency namecommons-logging/name - typerequired/type version1.0/version - jarcommons-logging-1.0.jar/jar /dependency /dependencies build nagEmailAddress[EMAIL PROTECTED]/nagEmailAddress -sourceDirectories - sourceDirectorysrc/java/sourceDirectory -/sourceDirectories - + +sourceDirectorysrc/java/sourceDirectory unitTestSourceDirectorysrc/test/unitTestSourceDirectory integrationUnitTestSourceDirectory/ - -aspectSourceDirectories -/aspectSourceDirectories +aspectSourceDirectories/ !-- Unit test classes -- unitTestPatterns -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/fileupload project.xml
jvanzyl 2002/06/04 05:07:45 Modified:fileupload project.xml Log: Correcting repository url. Revision ChangesPath 1.2 +1 -1 jakarta-commons-sandbox/fileupload/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/fileupload/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- project.xml 3 Jun 2002 16:31:42 - 1.1 +++ project.xml 4 Jun 2002 12:07:45 - 1.2 @@ -26,7 +26,7 @@ repository connectionscm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic/jakarta-commons-sandbox/fileupload//connection -urlhttp://cvs.apache.org/viewcvs/jakarta-turbine-3//url +urlhttp://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jdbc2pool//url /repository mailingLists -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/jexl build-maven.xml
jvanzyl 2002/06/04 09:42:41
Added: jexl build-maven.xml
Log:
Adding delegator to accompany the project.xml file.
Revision ChangesPath
1.1 jakarta-commons-sandbox/jexl/build-maven.xml
Index: build-maven.xml
===
?xml version=1.0?
project name=maven default=maven:jar basedir=.
!-- Give user a chance to override without editing this file
(and without typing -D each time they invoke a target) --
!-- Allow any user specific values to override the defaults --
property file=${user.home}/build.properties /
!-- Allow user defaults for this project --
property file=build.properties /
!-- Set default values for the build --
property file=project.properties /
!-- maven:start --
!-- == --
!-- D E L E G A T O R S--
!-- == --
target name=maven:site
ant antfile=${maven.home}/build-docs.xml target=site/
/target
target name=maven:fo
ant antfile=${maven.home}/build-docs.xml target=docs:fo/
/target
target name=maven:pdf
ant antfile=${maven.home}/build-docs.xml target=docs:pdf/
/target
target name=maven:jar
ant antfile=${maven.home}/build-maven.xml target=jar/
/target
target name=maven:install-jar
ant antfile=${maven.home}/build-maven.xml target=install-jar/
/target
target name=maven:env
ant antfile=${maven.home}/build-maven.xml target=env/
/target
target name=maven:docs
ant antfile=${maven.home}/build-docs.xml target=docs/
/target
target name=maven:test
ant antfile=${maven.home}/build-test.xml target=test/
/target
target name=maven:iutest
ant antfile=${maven.home}/build-iutest.xml target=test/
/target
target name=maven:clean
ant antfile=${maven.home}/build-maven.xml target=clean/
/target
target name=maven:metrics
ant antfile=${maven.home}/build-metrics.xml target=metrics/
/target
target name=maven:dist
ant antfile=${maven.home}/build-maven.xml target=dist/
/target
target name=maven:deploy-site
ant antfile=${maven.home}/build-docs.xml target=deploy-site/
/target
target name=maven:gump-descriptor
ant antfile=${maven.home}/build-maven.xml target=gump-descriptor/
/target
target name=maven:javadocs
ant antfile=${maven.home}/build-docs.xml target=javadocs/
/target
target name=maven:compile
ant antfile=${maven.home}/build-maven.xml target=compile/
/target
target name=maven:check-source
ant antfile=${maven.home}/build-maven.xml target=check-source/
/target
target name=maven:update-jars
ant antfile=${maven.home}/build-maven.xml target=update-jars/
/target
target name=maven:announce
ant antfile=${maven.home}/build-maven.xml target=announce/
/target
target name=maven:update-descriptor
ant antfile=${maven.home}/build-maven.xml target=update-descriptor/
/target
target name=maven:updates-available
ant antfile=${maven.home}/build-maven.xml target=updates-available/
/target
target name=maven:validate-pom
ant antfile=${maven.home}/build-maven.xml target=validate-pom/
/target
target name=maven:maven-update
ant antfile=${maven.home}/build-maven.xml target=maven-update/
/target
!-- maven:end --
/project
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/xdocs overview.xml
jvanzyl 2002/06/04 15:12:30 Modified:betwixt/xdocs overview.xml Log: Applying patch supplied by Martin van den Bemt [EMAIL PROTECTED]. Thanks. Revision ChangesPath 1.2 +2 -2 jakarta-commons-sandbox/betwixt/xdocs/overview.xml Index: overview.xml === RCS file: /home/cvs/jakarta-commons-sandbox/betwixt/xdocs/overview.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- overview.xml 22 May 2002 18:13:41 - 1.1 +++ overview.xml 4 Jun 2002 22:12:30 - 1.2 @@ -17,7 +17,7 @@ build system working, by installing Ant and creating your own build.properties to point to the required JARs type the following at a command line/p -preant demo-rss/pre +preant demo.rss/pre pThis uses the Commons Digester RSSDigester example to parse an RSS document, create a Channel bean and then write it out again as XML using the default @@ -26,7 +26,7 @@ pThe next example to look at is/p -preant demo-rss2/pre +preant demo.rss2/pre pThis is similar to the above but uses a BeanReader to parse the RSS file. So this is Betwixt defaulting the Digester rules required to parse the XML document. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons/dbcp maven-build.xml project.xml
jvanzyl 2002/06/04 08:01:08
Added: dbcp maven-build.xml project.xml
Log:
After chatting with Rodney I have added a Maven build in addition to
the regular build.
Revision ChangesPath
1.1 jakarta-commons/dbcp/maven-build.xml
Index: maven-build.xml
===
?xml version=1.0?
project name=maven default=maven:jar basedir=.
!-- Give user a chance to override without editing this file
(and without typing -D each time they invoke a target) --
!-- Allow any user specific values to override the defaults --
property file=${user.home}/build.properties /
!-- Allow user defaults for this project --
property file=build.properties /
!-- Set default values for the build --
property file=project.properties /
!-- maven:start --
!-- == --
!-- D E L E G A T O R S--
!-- == --
target name=maven:site
ant antfile=${maven.home}/build-docs.xml target=site/
/target
target name=maven:fo
ant antfile=${maven.home}/build-docs.xml target=docs:fo/
/target
target name=maven:pdf
ant antfile=${maven.home}/build-docs.xml target=docs:pdf/
/target
target name=maven:jar
ant antfile=${maven.home}/build-maven.xml target=jar/
/target
target name=maven:install-jar
ant antfile=${maven.home}/build-maven.xml target=install-jar/
/target
target name=maven:env
ant antfile=${maven.home}/build-maven.xml target=env/
/target
target name=maven:docs
ant antfile=${maven.home}/build-docs.xml target=docs/
/target
target name=maven:test
ant antfile=${maven.home}/build-test.xml target=test/
/target
target name=maven:iutest
ant antfile=${maven.home}/build-iutest.xml target=test/
/target
target name=maven:clean
ant antfile=${maven.home}/build-maven.xml target=clean/
/target
target name=maven:metrics
ant antfile=${maven.home}/build-metrics.xml target=metrics/
/target
target name=maven:dist
ant antfile=${maven.home}/build-maven.xml target=dist/
/target
target name=maven:deploy-site
ant antfile=${maven.home}/build-docs.xml target=deploy-site/
/target
target name=maven:gump-descriptor
ant antfile=${maven.home}/build-maven.xml target=gump-descriptor/
/target
target name=maven:javadocs
ant antfile=${maven.home}/build-docs.xml target=javadocs/
/target
target name=maven:compile
ant antfile=${maven.home}/build-maven.xml target=compile/
/target
target name=maven:check-source
ant antfile=${maven.home}/build-maven.xml target=check-source/
/target
target name=maven:update-jars
ant antfile=${maven.home}/build-maven.xml target=update-jars/
/target
target name=maven:announce
ant antfile=${maven.home}/build-maven.xml target=announce/
/target
target name=maven:update-descriptor
ant antfile=${maven.home}/build-maven.xml target=update-descriptor/
/target
target name=maven:updates-available
ant antfile=${maven.home}/build-maven.xml target=updates-available/
/target
target name=maven:validate-pom
ant antfile=${maven.home}/build-maven.xml target=validate-pom/
/target
target name=maven:maven-update
ant antfile=${maven.home}/build-maven.xml target=maven-update/
/target
!-- maven:end --
/project
1.1 jakarta-commons/dbcp/project.xml
Index: project.xml
===
?xml version=1.0 encoding=UTF-8?
project
pomVersion3/pomVersion
namecommons-dbcp/name
idcommons-dbcp/id
currentVersion1.0-dev/currentVersion
organization
nameApache Software Foundation/name
urlhttp://jakarta.apache.org//url
/organization
inceptionYear2002/inceptionYear
packageorg.apache.commons.dbcp/package
gumpRepositoryIdjakarta/gumpRepositoryId
shortDescriptionCommons Database Connection Pooling/shortDescription
description
Commons Database Connection Pooling
/description
urlhttp://jakarta.apache.org/commons/dbcp//url
issueTrackingUrlhttp://issues.apache.org/scarab/servlet/scarab//issueTrackingUrl
siteAddressjakarta.apache.org/siteAddress
siteDirectory/www/jakarta.apache.org/commons/dbcp//siteDirectory
repository
cvs commit: jakarta-commons/pool maven-build.xml project.xml
jvanzyl 2002/06/04 08:05:53
Added: pool maven-build.xml project.xml
Log:
After chatting with Rodney, I've added a maven build in addition to
the regular build.
Revision ChangesPath
1.1 jakarta-commons/pool/maven-build.xml
Index: maven-build.xml
===
?xml version=1.0?
project name=maven default=maven:jar basedir=.
!-- Give user a chance to override without editing this file
(and without typing -D each time they invoke a target) --
!-- Allow any user specific values to override the defaults --
property file=${user.home}/build.properties /
!-- Allow user defaults for this project --
property file=build.properties /
!-- Set default values for the build --
property file=project.properties /
!-- maven:start --
!-- == --
!-- D E L E G A T O R S--
!-- == --
target name=maven:site
ant antfile=${maven.home}/build-docs.xml target=site/
/target
target name=maven:fo
ant antfile=${maven.home}/build-docs.xml target=docs:fo/
/target
target name=maven:pdf
ant antfile=${maven.home}/build-docs.xml target=docs:pdf/
/target
target name=maven:jar
ant antfile=${maven.home}/build-maven.xml target=jar/
/target
target name=maven:install-jar
ant antfile=${maven.home}/build-maven.xml target=install-jar/
/target
target name=maven:env
ant antfile=${maven.home}/build-maven.xml target=env/
/target
target name=maven:docs
ant antfile=${maven.home}/build-docs.xml target=docs/
/target
target name=maven:test
ant antfile=${maven.home}/build-test.xml target=test/
/target
target name=maven:iutest
ant antfile=${maven.home}/build-iutest.xml target=test/
/target
target name=maven:clean
ant antfile=${maven.home}/build-maven.xml target=clean/
/target
target name=maven:metrics
ant antfile=${maven.home}/build-metrics.xml target=metrics/
/target
target name=maven:dist
ant antfile=${maven.home}/build-maven.xml target=dist/
/target
target name=maven:deploy-site
ant antfile=${maven.home}/build-docs.xml target=deploy-site/
/target
target name=maven:gump-descriptor
ant antfile=${maven.home}/build-maven.xml target=gump-descriptor/
/target
target name=maven:javadocs
ant antfile=${maven.home}/build-docs.xml target=javadocs/
/target
target name=maven:compile
ant antfile=${maven.home}/build-maven.xml target=compile/
/target
target name=maven:check-source
ant antfile=${maven.home}/build-maven.xml target=check-source/
/target
target name=maven:update-jars
ant antfile=${maven.home}/build-maven.xml target=update-jars/
/target
target name=maven:announce
ant antfile=${maven.home}/build-maven.xml target=announce/
/target
target name=maven:update-descriptor
ant antfile=${maven.home}/build-maven.xml target=update-descriptor/
/target
target name=maven:updates-available
ant antfile=${maven.home}/build-maven.xml target=updates-available/
/target
target name=maven:validate-pom
ant antfile=${maven.home}/build-maven.xml target=validate-pom/
/target
target name=maven:maven-update
ant antfile=${maven.home}/build-maven.xml target=maven-update/
/target
!-- maven:end --
/project
1.1 jakarta-commons/pool/project.xml
Index: project.xml
===
?xml version=1.0 encoding=UTF-8?
project
pomVersion3/pomVersion
namecommons-pool/name
idcommons-pool/id
currentVersion1.1-dev/currentVersion
organization
nameApache Software Foundation/name
urlhttp://jakarta.apache.org//url
/organization
inceptionYear2002/inceptionYear
packageorg.apache.commons.pool/package
gumpRepositoryIdjakarta/gumpRepositoryId
shortDescriptionCommons Database Connection Pooling/shortDescription
description
Commons Database Connection Pooling
/description
urlhttp://jakarta.apache.org/commons/pool//url
issueTrackingUrlhttp://issues.apache.org/scarab/servlet/scarab//issueTrackingUrl
siteAddressjakarta.apache.org/siteAddress
siteDirectory/www/jakarta.apache.org/commons/pool//siteDirectory
repository
cvs commit: jakarta-commons/pool build-maven.xml maven-build.xml
jvanzyl 2002/06/04 16:14:20
Added: pool build-maven.xml
Removed: pool maven-build.xml
Log:
It's build-maven.xml not maven-build.xml.
Revision ChangesPath
1.1 jakarta-commons/pool/build-maven.xml
Index: build-maven.xml
===
?xml version=1.0?
project name=maven default=maven:jar basedir=.
!-- Give user a chance to override without editing this file
(and without typing -D each time they invoke a target) --
!-- Allow any user specific values to override the defaults --
property file=${user.home}/build.properties /
!-- Allow user defaults for this project --
property file=build.properties /
!-- Set default values for the build --
property file=project.properties /
!-- maven:start --
!-- == --
!-- D E L E G A T O R S--
!-- == --
target name=maven:site
ant antfile=${maven.home}/build-docs.xml target=site/
/target
target name=maven:fo
ant antfile=${maven.home}/build-docs.xml target=docs:fo/
/target
target name=maven:pdf
ant antfile=${maven.home}/build-docs.xml target=docs:pdf/
/target
target name=maven:jar
ant antfile=${maven.home}/build-maven.xml target=jar/
/target
target name=maven:install-jar
ant antfile=${maven.home}/build-maven.xml target=install-jar/
/target
target name=maven:env
ant antfile=${maven.home}/build-maven.xml target=env/
/target
target name=maven:docs
ant antfile=${maven.home}/build-docs.xml target=docs/
/target
target name=maven:test
ant antfile=${maven.home}/build-test.xml target=test/
/target
target name=maven:iutest
ant antfile=${maven.home}/build-iutest.xml target=test/
/target
target name=maven:clean
ant antfile=${maven.home}/build-maven.xml target=clean/
/target
target name=maven:metrics
ant antfile=${maven.home}/build-metrics.xml target=metrics/
/target
target name=maven:dist
ant antfile=${maven.home}/build-maven.xml target=dist/
/target
target name=maven:deploy-site
ant antfile=${maven.home}/build-docs.xml target=deploy-site/
/target
target name=maven:gump-descriptor
ant antfile=${maven.home}/build-maven.xml target=gump-descriptor/
/target
target name=maven:javadocs
ant antfile=${maven.home}/build-docs.xml target=javadocs/
/target
target name=maven:compile
ant antfile=${maven.home}/build-maven.xml target=compile/
/target
target name=maven:check-source
ant antfile=${maven.home}/build-maven.xml target=check-source/
/target
target name=maven:update-jars
ant antfile=${maven.home}/build-maven.xml target=update-jars/
/target
target name=maven:announce
ant antfile=${maven.home}/build-maven.xml target=announce/
/target
target name=maven:update-descriptor
ant antfile=${maven.home}/build-maven.xml target=update-descriptor/
/target
target name=maven:updates-available
ant antfile=${maven.home}/build-maven.xml target=updates-available/
/target
target name=maven:validate-pom
ant antfile=${maven.home}/build-maven.xml target=validate-pom/
/target
target name=maven:maven-update
ant antfile=${maven.home}/build-maven.xml target=maven-update/
/target
!-- maven:end --
/project
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jsl example2.jelly
jvanzyl 2002/06/02 21:17:04
Modified:jelly/src/test/org/apache/commons/jelly/jsl example2.jelly
Log:
Fixing line endings, getting rid of tabs.
Revision ChangesPath
1.2 +99 -1
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jsl/example2.jelly
Index: example2.jelly
===
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/jsl/example2.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- example2.jelly25 May 2002 18:27:21 - 1.1
+++ example2.jelly3 Jun 2002 04:17:04 - 1.2
@@ -1 +1,99 @@
-?xml version=1.0?
j:jelly xmlns:j=jelly:core xmlns:x=jelly:xml
xmlns:jsl=jelly:jsl
html
body
x:parse var=doc
simpleDocument
author=James Elson
titleI am a title!/title
synopsisTwas a dark,
rainy night.../synopsis
paradfjsdfjsdf/para
parafdsfsdfhdsff gyuf
uysgf ds/para
/simpleDocument
/x:parse
h1Output of first
stylesheet1/h1
jsl:stylesheet source=${doc}
jsl:template match=/
jsl:applyTemplates/
/jsl:template
jsl:template match=title
h2jsl:applyTemplates//h2
/jsl:template
jsl:template match=para
pjsl:applyTemplates//p
/jsl:template
jsl:template match=*
smalljsl:applyTemplates//small
/jsl:template
/jsl:stylesheet
hr /
h1Output of stylesheet2/h1
jsl:stylesheet source=${doc}
jsl:template
match=/
jsl:applyTemplates/
/jsl:template
jsl:template match=*
smalljsl:applyTemplates//small
/jsl:template
jsl:template match=title
h2jsl:applyTemplates//h2
/jsl:template
jsl:template match=para
pjsl:applyTemplates//p
/jsl:template
/jsl:stylesheet
hr /
h1Output of stylesheet3/h1
jsl:stylesheet source=${doc}
jsl:template
match=/simpleDocument
h2Book review/h2
bTitle:/b jsl:applyTemplates
select=title/br /
bAuthor:/b jsl:applyTemplates select=@author/br /
bSummary:/b emjsl:applyTemplates select=synopsis//embr /
/jsl:template
jsl:template match=title
span
style=color:bluejsl:applyTemplates//span
/jsl:template
jsl:template
match=para
pjsl:applyTemplates//p
/jsl:template
/jsl:stylesheet
/body
/html
/j:jelly
\ No newline at end of file
+?xml version=1.0?
+j:jelly xmlns:j=jelly:core xmlns:x=jelly:xml xmlns:jsl=jelly:jsl
+
+html
+body
+
+ x:parse var=doc
+ simpleDocument author=James Elson
+
+titleI am a title!/title
+
+synopsisTwas a dark, rainy night.../synopsis
+
+paradfjsdfjsdf/para
+parafdsfsdfhdsff gyuf uysgf ds/para
+
+ /simpleDocument
+ /x:parse
+
+
+h1Output of first stylesheet1/h1
+
+jsl:stylesheet source=${doc}
+
+ jsl:template match=/
+jsl:applyTemplates/
+ /jsl:template
+
+ jsl:template match=title
+h2jsl:applyTemplates//h2
+ /jsl:template
+
+
+ jsl:template match=para
+pjsl:applyTemplates//p
+ /jsl:template
+
+ jsl:template match=*
+smalljsl:applyTemplates//small
+ /jsl:template
+
+/jsl:stylesheet
+
+hr /
+
+h1Output of stylesheet2/h1
+
+jsl:stylesheet source=${doc}
+
+ jsl:template match=/
+jsl:applyTemplates/
+ /jsl:template
+
+ jsl:template match=*
+smalljsl:applyTemplates//small
+ /jsl:template
+
+ jsl:template match=title
+h2jsl:applyTemplates//h2
+ /jsl:template
+
+
+ jsl:template match=para
+pjsl:applyTemplates//p
+ /jsl:template
+
+/jsl:stylesheet
+
+hr /
+
+h1Output of stylesheet3/h1
+
+
+jsl:stylesheet source=${doc}
+
+ jsl:template match=/simpleDocument
+ h2Book review/h2
+ bTitle:/b jsl:applyTemplates select=title/br /
+ bAuthor:/b jsl:applyTemplates select=@author/br /
+ bSummary:/b emjsl:applyTemplates select=synopsis//embr /
+ /jsl:template
+
+ jsl:template match=title
+span style=color:bluejsl:applyTemplates//span
+ /jsl:template
+
+
+ jsl:template match=para
+pjsl:applyTemplates//p
+ /jsl:template
+
+/jsl:stylesheet
+
+
+/body
+/html
+
+/j:jelly
+
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/ant example_tasks.jelly filescanner.jelly show_properties.jelly
jvanzyl 2002/06/02 21:31:55
Modified:jelly/src/test/org/apache/commons/jelly/ant
example_tasks.jelly filescanner.jelly
show_properties.jelly
Log:
Fixing line endings, removing tabs.
Revision ChangesPath
1.2 +18 -1
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/ant/example_tasks.jelly
Index: example_tasks.jelly
===
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/ant/example_tasks.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- example_tasks.jelly 2 Jun 2002 17:29:02 - 1.1
+++ example_tasks.jelly 3 Jun 2002 04:31:55 - 1.2
@@ -1 +1,18 @@
-?xml version=1.0?
j:jelly xmlns:j=jelly:core xmlns=jelly:ant
Lets start
by calling the echo task
!-- this example attempts to invoke some Ant
tasks --
echo message=Invoking the echo task from inside Jelly; the Maven
repository is ${lib.repo}/
!-- lets try invoke a program --
java
classname=org.apache.commons.jelly.Jelly fork=yes
classpath
refid=test.classpath/
arg
value=src/test/org/apache/commons/jelly/show_args.jelly/
arg value=one/
arg value=two/
arg value=three/
/java
We should be back to the
Jelly script again now...
/j:jelly
\ No newline at end of file
+?xml version=1.0?
+j:jelly xmlns:j=jelly:core xmlns=jelly:ant
+ Lets start by calling the echo task
+
+ !-- this example attempts to invoke some Ant tasks --
+ echo message=Invoking the echo task from inside Jelly; the Maven repository is
${lib.repo}/
+
+ !-- lets try invoke a program --
+ java classname=org.apache.commons.jelly.Jelly fork=yes
+classpath refid=test.classpath/
+arg value=src/test/org/apache/commons/jelly/show_args.jelly/
+arg value=one/
+arg value=two/
+arg value=three/
+ /java
+
+ We should be back to the Jelly script again now...
+/j:jelly
1.2 +17 -1
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/ant/filescanner.jelly
Index: filescanner.jelly
===
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/ant/filescanner.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filescanner.jelly 2 Jun 2002 17:29:02 - 1.1
+++ filescanner.jelly 3 Jun 2002 04:31:55 - 1.2
@@ -1 +1,17 @@
-?xml version=1.0?
j:jelly xmlns:j=jelly:core xmlns=jelly:ant
fileScanner var=scanner
fileset dir=src/taglibs includes=**/build.xml/
/fileScanner
Iterating through build files
j:forEach var=file
items=${scanner.iterator()}
!-- here we could parse the file or process it
in some way --
!-- such as by calling ant with the given build.xml file
--
Found j:expr value=${file.absolutePath}/
/j:forEach
/j:jelly
\ No newline at end of file
+?xml version=1.0?
+j:jelly xmlns:j=jelly:core xmlns=jelly:ant
+
+ fileScanner var=scanner
+fileset dir=src/taglibs includes=**/build.xml/
+ /fileScanner
+
+ Iterating through build files
+
+ j:forEach var=file items=${scanner.iterator()}
+
+!-- here we could parse the file or process it in some way --
+!-- such as by calling ant with the given build.xml file --
+
+Found j:expr value=${file.absolutePath}/
+ /j:forEach
+/j:jelly
1.2 +42 -7
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/ant/show_properties.jelly
Index: show_properties.jelly
===
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/ant/show_properties.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- show_properties.jelly 2 Jun 2002 17:29:02 - 1.1
+++ show_properties.jelly 3 Jun 2002 04:31:55 - 1.2
@@ -1,7 +1,42 @@
-?xml version=1.0?
j:jelly xmlns:j=jelly:core
-html
- body
-h1Ant properties/h1
pThe project name is bj:expr
value=${project.name}//b
/p
-table
tr
thTargets/th
/tr
j:forEach
var=iter items=${project.targets}
tr
tdj:expr
value=${iter.key}//td
/tr
/j:forEach
/table
table
tr
thProperty Name/th
thProperty Value/th
/tr
j:forEach var=iter items=${project.getProperties()}
tr
tdj:expr value=${iter.key}//td
tdj:expr
value=${iter.value}//td
/tr
/j:forEach
/table
/body
-/html
-/j:jelly
\ No newline at end of file
+?xml version=1.0?
+j:jelly xmlns:j
cvs commit: jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml example.jelly testForEach.jelly
jvanzyl 2002/06/02 22:14:30 Modified:jelly/src/test/org/apache/commons/jelly example2.jelly example3.jelly hello_world.jelly run_all.jelly show_args.jelly show_properties.jelly testFindVariable.jelly test_args.jelly jelly/src/test/org/apache/commons/jelly/define babelfishTaglib.jelly example.jelly jelly/src/test/org/apache/commons/jelly/jsl example.jelly jelly/src/test/org/apache/commons/jelly/sql example.jelly example2.jelly testSql.jelly jelly/src/test/org/apache/commons/jelly/xml example.jelly testForEach.jelly Log: Trying to fix all the line endings and get rid of the tabs. Revision ChangesPath 1.5 +16 -8 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/example2.jelly Index: example2.jelly === RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/example2.jelly,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- example2.jelly21 May 2002 16:53:26 - 1.4 +++ example2.jelly3 Jun 2002 05:14:29 - 1.5 @@ -1,6 +1,9 @@ -?xml version=1.0? -j:jelly xmlns:j=jelly:core xmlns:x=jelly:xml - x:parse var=doc web-app +?xml version=1.0? + +j:jelly xmlns:j=jelly:core xmlns:x=jelly:xml + + x:parse var=doc +web-app servlet servlet-namesnoop/servlet-name servlet-classSnoopServlet/servlet-class @@ -21,12 +24,17 @@ url-pattern/foo/snoop/url-pattern /servlet-mapping /web-app - /x:parse + /x:parse + x:set var=count select=count($doc//servlet)/ x:forEach var=s select=$doc//servlet name: x:expr select=$s/servlet-name/ class: x:expr select=$s/servlet-class/ - /x:forEach - There are x:expr select=$count/ servlet(s) -/j:jelly - + /x:forEach + + There are x:expr select=$count/ servlet(s) + +/j:jelly + + + 1.5 +12 -4 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/example3.jelly Index: example3.jelly === RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/example3.jelly,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- example3.jelly21 May 2002 16:53:26 - 1.4 +++ example3.jelly3 Jun 2002 05:14:29 - 1.5 @@ -1,5 +1,11 @@ -?xml version=1.0? jelly xmlns=jelly:core - !-- a really silly way to do this but -- !-- this should test the choose/when/otherwise tags -- forEach var=iter items=System.getProperties() choose when test='iter.key.equals( java.home )' +?xml version=1.0? +jelly xmlns=jelly:core + + !-- a really silly way to do this but -- + !-- this should test the choose/when/otherwise tags -- + forEach var=iter items=System.getProperties() +choose + when test='iter.key.equals( java.home )' Java Home = expr value=iter.value/ /when when test='iter.key.equals( java.version )' @@ -10,5 +16,7 @@ /otherwise /choose /forEach -/jelly - +/jelly + + + 1.4 +6 -3 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/hello_world.jelly Index: hello_world.jelly === RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/hello_world.jelly,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hello_world.jelly 25 Apr 2002 16:35:55 - 1.3 +++ hello_world.jelly 3 Jun 2002 05:14:29 - 1.4 @@ -1,4 +1,7 @@ -?xml version=1.0? -j:jelly xmlns:j=jelly:core - Hello World! +?xml version=1.0? + +j:jelly xmlns:j=jelly:core + + Hello World! + /j:jelly 1.5 +21 -6 jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/run_all.jelly Index: run_all.jelly === RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/run_all.jelly,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- run_all.jelly 2 Jun 2002 17:29:02 - 1.4 +++ run_all.jelly 3 Jun 2002 05:14:29 - 1.5 @@ -1,9 +1,24 @@ -?xml version=1.0? j:jelly xmlns:j=jelly:core !-- try an absolute path -- - j:include uri=/src/test/org/apache/commons/jelly/hello_world.jelly/ !-- include other relative scripts... -- - j:include uri=example2.jelly/ j:include uri=jsl/example.jelly/ j:include uri=ant/filescanner.jelly
cvs commit: jakarta-commons-sandbox/graph2 project.xml
jvanzyl 2002/05/31 06:12:11 Modified:graph2 project.xml Log: Updating dependencies to new format. Revision ChangesPath 1.7 +1 -13 jakarta-commons-sandbox/graph2/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/graph2/project.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project.xml 28 May 2002 15:39:31 - 1.6 +++ project.xml 31 May 2002 13:12:11 - 1.7 @@ -44,28 +44,16 @@ /developers dependencies dependency - namejakarta-log4j/name - typerequired/type + namelog4j/name version1.1.3/version - jarlog4j-1.1.3.jar/jar /dependency dependency namensuml/name - typerequired/type version0.4.20/version - jarnsuml.jar/jar /dependency dependency namecommons-collections/name - typerequired/type version1.0/version - jarcommons-collections.jar/jar -/dependency -dependency - namejdepend/name - typerequired/type - version1.0/version - jarjdepend.jar/jar /dependency /dependencies build -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/strategy - New directory
jvanzyl 2002/05/31 16:17:15 jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/strategy - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/strategy TestHyphenatedNameMapper.java
jvanzyl 2002/05/31 16:17:55
Added: betwixt/src/test/org/apache/commons/betwixt/strategy
TestHyphenatedNameMapper.java
Log:
Test for mapping Bean to hyphenated element names.
Revision ChangesPath
1.1
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/strategy/TestHyphenatedNameMapper.java
Index: TestHyphenatedNameMapper.java
===
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*
* $Id: TestHyphenatedNameMapper.java,v 1.1 2002/05/31 23:17:55 jvanzyl Exp $
*/
package org.apache.commons.betwixt.strategy;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
/** Test harness for the HyphenatedNameMapper
*
* @author a href=mailto:[EMAIL PROTECTED];Jason van Zyl/a
* @version $Revision: 1.1 $
*/
public class TestHyphenatedNameMapper extends TestCase {
public static Test suite() {
return new TestSuite(TestHyphenatedNameMapper.class);
}
public TestHyphenatedNameMapper(String testName) {
super(testName);
}
public void testBeanWriter() {
HyphenatedNameMapper mapper = new HyphenatedNameMapper();
String result = mapper.mapTypeToElementName(FooBar);
assertEquals(foo-bar, result);
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/strategy HyphenatedNameMapper.java
jvanzyl 2002/05/31 16:19:10
Added: betwixt/src/java/org/apache/commons/betwixt/strategy
HyphenatedNameMapper.java
Log:
Little Bean to hyphenated element name mapper. Using this to map some
scarab XML files.
Revision ChangesPath
1.1
jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/strategy/HyphenatedNameMapper.java
Index: HyphenatedNameMapper.java
===
/*
* $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/strategy/HyphenatedNameMapper.java,v
1.1 2002/05/31 23:19:10 jvanzyl Exp $
* $Revision: 1.1 $
* $Date: 2002/05/31 23:19:10 $
*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Commons, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
* $Id: HyphenatedNameMapper.java,v 1.1 2002/05/31 23:19:10 jvanzyl Exp $
*/
package org.apache.commons.betwixt.strategy;
import java.beans.Introspector;
/**
* A name mapper which converts types to a hypenated String. So
* a bean type of FooBar will be converted to the element name foo-bar
*
* @author a href=mailto:[EMAIL PROTECTED];Jason van Zyl/a
* @version $Revision: 1.1 $
*/
public class HyphenatedNameMapper implements NameMapper {
/**
* @return the element name for the given bean type name
*/
public String mapTypeToElementName(String typeName) {
StringBuffer sb = new StringBuffer();
sb.append(Character.toLowerCase(typeName.charAt(0)));
for (int i = 1; i typeName.length(); i++) {
if (Character.isUpperCase(typeName.charAt(i))) {
sb.append('-');
sb.append(Character.toLowerCase(typeName.charAt(i)));
}
else {
sb.append(typeName.charAt(i));
}
}
return sb.toString();
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/scarab - New directory
jvanzyl 2002/05/31 16:31:37 jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/scarab - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/digester XMLIntrospectorHelper.java
jvanzyl 02/05/29 04:54:56
Modified:betwixt/src/java/org/apache/commons/betwixt/digester
XMLIntrospectorHelper.java
Log:
Just adding a little debugging.
Revision ChangesPath
1.8 +12 -6
jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java
Index: XMLIntrospectorHelper.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLIntrospectorHelper.java28 May 2002 23:01:07 - 1.7
+++ XMLIntrospectorHelper.java29 May 2002 11:54:56 - 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java,v
1.7 2002/05/28 23:01:07 jstrachan Exp $
- * $Revision: 1.7 $
- * $Date: 2002/05/28 23:01:07 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/digester/XMLIntrospectorHelper.java,v
1.8 2002/05/29 11:54:56 jvanzyl Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/05/29 11:54:56 $
*
*
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
- * $Id: XMLIntrospectorHelper.java,v 1.7 2002/05/28 23:01:07 jstrachan Exp $
+ * $Id: XMLIntrospectorHelper.java,v 1.8 2002/05/29 11:54:56 jvanzyl Exp $
*/
package org.apache.commons.betwixt.digester;
@@ -99,7 +99,7 @@
* common code shared between the digestor and introspector./p
*
* @author a href=mailto:[EMAIL PROTECTED];James Strachan/a
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class XMLIntrospectorHelper {
@@ -407,7 +407,13 @@
makeElementDescriptorMap( rootDescriptor, map );
PluralStemmer stemmer = introspector.getPluralStemmer();
-return stemmer.findPluralDescriptor( propertyName, map );
+ElementDescriptor elementDescriptor = stemmer.findPluralDescriptor(
propertyName, map );
+
+if ( log.isTraceEnabled() ) {
+log.trace( findPluralDescriptor( + propertyName +
):ElementDescriptor= + elementDescriptor );
+}
+
+return elementDescriptor;
}
/**
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/io BeanCreateRule.java
jvanzyl 02/05/29 05:26:51
Modified:betwixt/src/java/org/apache/commons/betwixt/io
BeanCreateRule.java
Log:
Fixing typo.
Revision ChangesPath
1.10 +3 -3
jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java
Index: BeanCreateRule.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/betwixt/src/java/org/apache/commons/betwixt/io/BeanCreateRule.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BeanCreateRule.java 28 May 2002 23:01:08 - 1.9
+++ BeanCreateRule.java 29 May 2002 12:26:51 - 1.10
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*
- * $Id: BeanCreateRule.java,v 1.9 2002/05/28 23:01:08 jstrachan Exp $
+ * $Id: BeanCreateRule.java,v 1.10 2002/05/29 12:26:51 jvanzyl Exp $
*/
package org.apache.commons.betwixt.io;
@@ -33,7 +33,7 @@
* from the betwixt XML metadata./p
*
* @author a href=mailto:[EMAIL PROTECTED];James Strachan/a
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class BeanCreateRule extends Rule {
@@ -283,7 +283,7 @@
/**
* @return true if this descriptor is a primitive type or
- * the priperty descriptor is a collection of primitive types
+ * the property descriptor is a collection of primitive types
*/
protected boolean isPrimitiveType( ElementDescriptor descriptor ) {
if ( descriptor.isPrimitiveType() ) {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project BaseObject.java Developer.java Project.java TestProjectRoundTrip.java project.xml
jvanzyl 02/05/28 05:02:42 Removed: betwixt/src/test/org/apache/commons/betwixt/project BaseObject.java Developer.java Project.java TestProjectRoundTrip.java project.xml Log: James started a proper test for the maven project descriptor so I'm removing these and will help him with his efforts. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/graph2 project.xml
jvanzyl 02/05/28 08:13:55 Modified:graph2 project.xml Log: Changing the version and making a little release that has been pushed into the repository. Revision ChangesPath 1.5 +9 -63 jakarta-commons-sandbox/graph2/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons-sandbox/graph2/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 8 May 2002 18:09:19 - 1.4 +++ project.xml 28 May 2002 15:13:55 - 1.5 @@ -1,27 +1,19 @@ -?xml version=1.0? -project +?xml version=1.0 encoding=UTF-8? +project namejakarta-commons-graph2/name idgraph/id - currentVersion0.3/currentVersion + currentVersion0.8/currentVersion organizationApache Software Foundation/organization inceptionYear2001/inceptionYear packageorg.apache.commons.graph/package - shortDescriptionGraph Representation and Manipulation Library/shortDescription - - description - ![CDATA[ -Jakarta Graph is a toolkit for managing graphs and graph based data structures. - ]] - /description - + descriptionJakarta Graph is a toolkit for managing graphs and graph based data structures./description urlhttp://jakarta.apache.org/commons/graph//url cvsWebUrlhttp://cvs.apache.org/viewcvs/jakarta-commons-sandbox/graph2/cvsWebUrl siteAddressjakarta.apache.org/siteAddress siteDirectory/www/jakarta.apache.org/commons/graph//siteDirectory distributionDirectory/www/jakarta.apache.org/builds/jakarta-commons-graph//distributionDirectory - mailingLists mailingList nameTurbine User List/name @@ -36,113 +28,67 @@ archivehttp://www.mail-archive.com/turbine-dev@jakarta.apache.org//archive /mailingList /mailingLists - developers - -!-- Eventually this might be a reference to a developer - id, but the question is where the individual entries - should reside. For the Turbine projects maybe an overall - repository of developer entries, but for other projects - what do we do. A global repository of Java developer ids? - - I am adding the login for each developer, so maybe this - is really a per-project things like password and login - may be different for each project but possibly the - identity of the developer could be store in some - repository. Anyway, suggests tweaks to the model. --- - developer nameDavid Dixon-Peugh/name iddpeugh/id email[EMAIL PROTECTED]/email organizationUltraLog At DARPA/organization /developer - developer nameJason van Zyl/name idjvanzyl/id email[EMAIL PROTECTED]/email organizationZenplex/organization /developer - /developers - - - !-- Need to mark these as compile-time/run-time -- - dependencies - dependency namejakarta-log4j/name typerequired/type version1.1.3/version jarlog4j-1.1.3.jar/jar /dependency - dependency namensuml/name typerequired/type version0.4.20/version jarnsuml.jar/jar /dependency - dependency namecommons-collections/name typerequired/type version1.0/version jarcommons-collections.jar/jar /dependency - dependency namejdepend/name typerequired/type version1.0/version jarjdepend.jar/jar /dependency - /dependencies - build - sourceDirectories sourceDirectorysrc/java/sourceDirectory /sourceDirectories - testSourceDirectories testSourceDirectorysrc/java/testSourceDirectory testSourceDirectorysrc/test/testSourceDirectory /testSourceDirectories - -aspectSourceDirectories -/aspectSourceDirectories - +aspectSourceDirectories/ !-- Unit test classes -- + unitTestClassEntries unitTestClassEntryinclude = **/*Test.class/unitTestClassEntry -!-- - unitTestClassEntryexclude = **/AllPathsTest.class/unitTestClassEntry --- /unitTestClassEntries - !-- Runtime unit test classes -- -runtimeTestClassEntries -/runtimeTestClassEntries +runtimeTestClassEntries/ !-- J A R R E S O U R C E S -- !-- Resources that are packaged up inside the JAR file -- -jarResources -/jarResources - -jars -/jars +jarResources/ +jars/ /build /project - - - - - - - -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt TestMavenProject.java Project.java project.xml
jvanzyl 02/05/28 18:32:56
Modified:betwixt/src/test/org/apache/commons/betwixt
TestMavenProject.java
Removed: betwixt/src/test/org/apache/commons/betwixt Project.java
project.xml
Log:
Removing old project test files as the Maven POM is being used directly.
Added a test that makes the Maven mapping fail, trying to find the problem
now.
Revision ChangesPath
1.5 +2 -0
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestMavenProject.java
Index: TestMavenProject.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestMavenProject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestMavenProject.java 28 May 2002 23:01:08 - 1.4
+++ TestMavenProject.java 29 May 2002 01:32:56 - 1.5
@@ -238,6 +238,8 @@
assertEquals( commons-logging, dependency.getName() );
assertEquals( required, dependency.getType() );
+List sourceDirectories = project.getBuild().getSourceDirectories();
+assertEquals(src/java, (String) sourceDirectories.get(0));
}
protected void write(Object bean, Writer out) throws Exception {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt TestMavenProject.java
jvanzyl 02/05/28 18:40:53 Modified:betwixt/src/test/org/apache/commons/betwixt TestMavenProject.java Log: The type element is no longer required. Revision ChangesPath 1.6 +0 -1 jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestMavenProject.java Index: TestMavenProject.java === RCS file: /home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestMavenProject.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- TestMavenProject.java 29 May 2002 01:32:56 - 1.5 +++ TestMavenProject.java 29 May 2002 01:40:53 - 1.6 @@ -236,7 +236,6 @@ Dependency dependency = (Dependency) dependencies.get(0); assertEquals( commons-logging, dependency.getName() ); -assertEquals( required, dependency.getType() ); List sourceDirectories = project.getBuild().getSourceDirectories(); assertEquals(src/java, (String) sourceDirectories.get(0)); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/configuration - Imported sources
jvanzyl 02/04/16 12:05:27 Log: Stratum - Commons Status: Vendor Tag: jakarta Release Tags: CONFIGURATION_1_0 N jakarta-commons-sandbox/configuration/project.xml N jakarta-commons-sandbox/configuration/project.properties N jakarta-commons-sandbox/configuration/build.xml N jakarta-commons-sandbox/configuration/.cvsignore N jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/BaseConfiguration.java N jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/ConfigurationConverter.java N jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/Configuration.java N jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/package.html N jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/PropertiesConfiguration.java N jakarta-commons-sandbox/configuration/src/java/org/apache/commons/configuration/XmlConfiguration.java N jakarta-commons-sandbox/configuration/src/test/org/apache/commons/configuration/TestBaseConfiguration.java N jakarta-commons-sandbox/configuration/src/test/org/apache/commons/configuration/TestConfigurationConverter.java No conflicts created by this import -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project Project.java TestProjectRoundTrip.java
jvanzyl 02/04/14 17:22:49
Modified:betwixt/src/test/org/apache/commons/betwixt/project
Project.java TestProjectRoundTrip.java
Removed: betwixt/src/test/org/apache/commons/betwixt
TestProjectRoundTrip.java
Log:
Had a test in the wrong place and discovered that the defaultAddMethods
mechanism isn't working properly. Working on fixing it.
Revision ChangesPath
1.3 +10 -5
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/Project.java
Index: Project.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/Project.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Project.java 10 Mar 2002 19:38:49 - 1.2
+++ Project.java 15 Apr 2002 00:22:49 - 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/Project.java,v
1.2 2002/03/10 19:38:49 jvanzyl Exp $
- * $Revision: 1.2 $
- * $Date: 2002/03/10 19:38:49 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/Project.java,v
1.3 2002/04/15 00:22:49 jvanzyl Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/15 00:22:49 $
*
*
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
- * $Id: Project.java,v 1.2 2002/03/10 19:38:49 jvanzyl Exp $
+ * $Id: Project.java,v 1.3 2002/04/15 00:22:49 jvanzyl Exp $
*/
package org.apache.commons.betwixt.project;
@@ -76,7 +76,7 @@
/** pcodeProject/code is a sample bean for use by the test cases./p
*
* @author a href=mailto:[EMAIL PROTECTED];Jason van Zyl/a
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class Project
extends BaseObject
@@ -118,6 +118,11 @@
{
this.developerList = developerList;
}
+
+public Developer getDeveloper(int i)
+{
+return (Developer) developerList.get(i);
+}
public ArrayList getDeveloperList()
{
1.4 +6 -3
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/TestProjectRoundTrip.java
Index: TestProjectRoundTrip.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/TestProjectRoundTrip.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestProjectRoundTrip.java 10 Mar 2002 20:16:03 - 1.3
+++ TestProjectRoundTrip.java 15 Apr 2002 00:22:49 - 1.4
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*
- * $Id: TestProjectRoundTrip.java,v 1.3 2002/03/10 20:16:03 jvanzyl Exp $
+ * $Id: TestProjectRoundTrip.java,v 1.4 2002/04/15 00:22:49 jvanzyl Exp $
*/
package org.apache.commons.betwixt.project;
@@ -28,7 +28,7 @@
/** Test harness for the BeanReader that deals with project definitions.
*
* @author a href=mailto:[EMAIL PROTECTED];Jason van Zyl/a
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class TestProjectRoundTrip extends TestCase {
@@ -56,10 +56,13 @@
assertEquals(jakarta-turbine-maven, project.getName());
assertEquals(org.apache.maven, project.getPackage());
+Developer d = project.getDeveloper(0);
+System.err.println(! + d.getEmail());
+
assertEquals([EMAIL PROTECTED],
((Developer)project.getDeveloperList().get(0)).getEmail());
-//writeBean( project );
+writeBean( project );
}
catch (Exception e)
{
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/graph2/src/java/org/apache/commons/graph/impl DirectedGraphImpl.java
jvanzyl 02/03/24 07:50:00
Modified:graph2 project.xml
graph2/src/java/org/apache/commons/graph/impl
DirectedGraphImpl.java
Log:
Adding fix so that the directed graph impl is not 1.4 specific and
filtering inner classes out of the tests.
Revision ChangesPath
1.2 +2 -3 jakarta-commons-sandbox/graph2/project.xml
Index: project.xml
===
RCS file: /home/cvs/jakarta-commons-sandbox/graph2/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 17 Mar 2002 16:28:13 - 1.1
+++ project.xml 24 Mar 2002 15:50:00 - 1.2
@@ -82,9 +82,8 @@
/aspectSourceDirectories
unitTestClassEntries
- unitTestClassEntry
- exclude = **/*.class
- /unitTestClassEntry
+ unitTestClassEntryinclude = **/*Test*.class/unitTestClassEntry
+ unitTestClassEntryexclude = **/*$*.class/unitTestClassEntry
/unitTestClassEntries
runtimeTestClassEntries
1.2 +4 -7
jakarta-commons-sandbox/graph2/src/java/org/apache/commons/graph/impl/DirectedGraphImpl.java
Index: DirectedGraphImpl.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/graph2/src/java/org/apache/commons/graph/impl/DirectedGraphImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DirectedGraphImpl.java17 Mar 2002 16:28:16 - 1.1
+++ DirectedGraphImpl.java24 Mar 2002 15:50:00 - 1.2
@@ -452,16 +452,13 @@
Object args[])
throws Throwable
{
-try
+try
{
return method.invoke(this, args);
-}
-catch (InvocationTargetException ex)
+}
+catch (InvocationTargetException ex)
{
-//!! David can fix this, this needs to run on 1.3
-return null;
-//throw ex.getCause();
+throw ex.getTargetException();
}
}
-
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/graph/src/test/org/apache/commons/graph/util TestDependencyResolver.java
jvanzyl 02/03/24 08:07:51 Removed: graph.cvsignore LICENSE NOTES PROPOSAL README.txt build-test.xml build.xml default.properties graph/src/conf MANIFEST.MF graph/src/java/org/apache/commons/graph BFS.java DFS.java DirectedGraph.java Edge.java Graph.java GraphAlgorithms.java GraphConstants.java GraphError.java Graphable.java Label.java LabeledEdge.java LabeledVertex.java Sequential.java TraversalOrder.java UndirectedGraph.java VQueue.java VStack.java Vertex.java WeightedEdge.java graph/src/java/org/apache/commons/graph/algo BackEdges.java MinimumSpanningForest.java Sort.java graph/src/java/org/apache/commons/graph/exception BackEdgeException.java GraphException.java graph/src/java/org/apache/commons/graph/util DependencyResolver.java graph/src/java/org/apache/commons/graph/visitor BFSVisitor.java DFSVisitor.java DefaultVisitor.java DependencyVisitor.java PrintVisitor.java SCCVisitor.java Visitor.java graph/src/java/org/apache/commons/graph/visualize DaVinciVisualizer.java GMLVisualizer.java GraphMLVisualizer.java GraphVisualizer.java VCGVisualizer.java graph/src/test/org/apache/commons/graph/algo TestBackEdges.java TestMinimumSpanningForest.java TestSort.java graph/src/test/org/apache/commons/graph/util TestDependencyResolver.java Log: Removing first swipe at the graph package, this will be replaced with a rewritten version that is more functional and contract-based. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project - New directory
jvanzyl 02/03/10 11:34:10 jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project BaseObject.java Developer.java Project.java TestProjectRoundTrip.java project.xml
jvanzyl 02/03/10 11:35:28
Added: betwixt/src/test/org/apache/commons/betwixt/project
BaseObject.java Developer.java Project.java
TestProjectRoundTrip.java project.xml
Log:
Placing the project tests in a package of their own.
Revision ChangesPath
1.1
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/BaseObject.java
Index: BaseObject.java
===
package org.apache.commons.betwixt.project;
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution,
*if any, must include the following acknowledgment:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowledgment may appear in the software itself,
*if and wherever such third-party acknowledgments normally appear.
*
* 4. The names Apache and Apache Software Foundation and
*Apache Maven must not be used to endorse or promote products
*derived from this software without prior written permission. For
*written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache,
*Apache Maven, nor may Apache appear in their name, without
*prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*/
/**
* @author a href=mailto:[EMAIL PROTECTED];Jason van Zyl/a
* @version $Id: BaseObject.java,v 1.1 2002/03/10 19:35:28 jvanzyl Exp $
*/
public class BaseObject
{
/**
* Display name to use for this object.
*/
private String name;
/**
* Id to use for this object.
*/
private String id;
/**
* Sets the name attribute of the BaseObject object
*/
public void setName(String name)
{
this.name = name;
}
/**
* Gets the name attribute of the BaseObject object
*/
public String getName()
{
return name;
}
/**
* Sets the id attribute of the BaseObject object
*/
public void setId(String id)
{
this.id = id;
}
/**
* Gets the id attribute of the BaseObject object
*/
public String getId()
{
return id;
}
/**
* Description of the Method
*/
public String toString()
{
return name;
}
}
1.1
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/Developer.java
Index: Developer.java
===
package org.apache.commons.betwixt.project;
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project Project.java TestProjectRoundTrip.java
jvanzyl 02/03/10 11:38:49
Modified:betwixt/src/test/org/apache/commons/betwixt/project
Project.java TestProjectRoundTrip.java
Log:
Didn't mean to check in a failing test, working on finding the problem.
Revision ChangesPath
1.2 +4 -3
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/Project.java
Index: Project.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/Project.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Project.java 10 Mar 2002 19:35:28 - 1.1
+++ Project.java 10 Mar 2002 19:38:49 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/Project.java,v
1.1 2002/03/10 19:35:28 jvanzyl Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/10 19:35:28 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/Project.java,v
1.2 2002/03/10 19:38:49 jvanzyl Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/10 19:38:49 $
*
*
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
- * $Id: Project.java,v 1.1 2002/03/10 19:35:28 jvanzyl Exp $
+ * $Id: Project.java,v 1.2 2002/03/10 19:38:49 jvanzyl Exp $
*/
package org.apache.commons.betwixt.project;
@@ -76,9 +76,10 @@
/** pcodeProject/code is a sample bean for use by the test cases./p
*
* @author a href=mailto:[EMAIL PROTECTED];Jason van Zyl/a
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class Project
+extends BaseObject
implements Serializable {
/** Logger */
1.2 +9 -7
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/TestProjectRoundTrip.java
Index: TestProjectRoundTrip.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/TestProjectRoundTrip.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestProjectRoundTrip.java 10 Mar 2002 19:35:28 - 1.1
+++ TestProjectRoundTrip.java 10 Mar 2002 19:38:49 - 1.2
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*
- * $Id: TestProjectRoundTrip.java,v 1.1 2002/03/10 19:35:28 jvanzyl Exp $
+ * $Id: TestProjectRoundTrip.java,v 1.2 2002/03/10 19:38:49 jvanzyl Exp $
*/
package org.apache.commons.betwixt.project;
@@ -28,7 +28,7 @@
/** Test harness for the BeanReader that deals with project definitions.
*
* @author a href=mailto:[EMAIL PROTECTED];Jason van Zyl/a
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class TestProjectRoundTrip extends TestCase {
@@ -52,15 +52,17 @@
try {
-Project bean = (Project) reader.parse( in );
-assertEquals(org.apache.maven, bean.getPackage());
-assertEquals([EMAIL PROTECTED],
-((Developer)bean.getDeveloperList().get(0)).getEmail());
-//writeBean( bean );
+Project project = (Project) reader.parse( in );
+assertEquals(jakarta-turbine-maven, project.getName());
+assertEquals(org.apache.maven, project.getPackage());
+
+//assertEquals([EMAIL PROTECTED],
+//((Developer)project.getDeveloperList().get(0)).getEmail());
+
+//writeBean( project );
}
catch (Exception e)
{
-e.printStackTrace();
fail();
}
finally {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project BaseObject.java TestProjectRoundTrip.java
jvanzyl 02/03/10 12:16:03
Modified:betwixt/src/test/org/apache/commons/betwixt/project
BaseObject.java TestProjectRoundTrip.java
Log:
This is as close as I can get without changing any code:
You seem to need:
developerList
Developer
...
/Developer
/developerList
In order to strike a match, possibly an error on my part but using
DeveloperList didn't seem to trigger the firing of an addXXX() method.
Also, even though the addDeveloper(Developer) method is correctly found
an attempt to use addDeveloper(ArrayList) is made because the return
type for getDeveloperList is an ArrayList.
There also seemed to be problems when the return type was an interface like
List.
Just trying to report of what I'm finding ... Hopefully I will be of some help
in the coming days.
Revision ChangesPath
1.2 +3 -1
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/BaseObject.java
Index: BaseObject.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/BaseObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseObject.java 10 Mar 2002 19:35:28 - 1.1
+++ BaseObject.java 10 Mar 2002 20:16:03 - 1.2
@@ -56,7 +56,7 @@
/**
* @author a href=mailto:[EMAIL PROTECTED];Jason van Zyl/a
- * @version $Id: BaseObject.java,v 1.1 2002/03/10 19:35:28 jvanzyl Exp $
+ * @version $Id: BaseObject.java,v 1.2 2002/03/10 20:16:03 jvanzyl Exp $
*/
public class BaseObject
{
@@ -105,8 +105,10 @@
/**
* Description of the Method
*/
+ /*
public String toString()
{
return name;
}
+*/
}
1.3 +5 -4
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/TestProjectRoundTrip.java
Index: TestProjectRoundTrip.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/project/TestProjectRoundTrip.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestProjectRoundTrip.java 10 Mar 2002 19:38:49 - 1.2
+++ TestProjectRoundTrip.java 10 Mar 2002 20:16:03 - 1.3
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*
- * $Id: TestProjectRoundTrip.java,v 1.2 2002/03/10 19:38:49 jvanzyl Exp $
+ * $Id: TestProjectRoundTrip.java,v 1.3 2002/03/10 20:16:03 jvanzyl Exp $
*/
package org.apache.commons.betwixt.project;
@@ -28,7 +28,7 @@
/** Test harness for the BeanReader that deals with project definitions.
*
* @author a href=mailto:[EMAIL PROTECTED];Jason van Zyl/a
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class TestProjectRoundTrip extends TestCase {
@@ -56,13 +56,14 @@
assertEquals(jakarta-turbine-maven, project.getName());
assertEquals(org.apache.maven, project.getPackage());
-//assertEquals([EMAIL PROTECTED],
-//((Developer)project.getDeveloperList().get(0)).getEmail());
+assertEquals([EMAIL PROTECTED],
+((Developer)project.getDeveloperList().get(0)).getEmail());
//writeBean( project );
}
catch (Exception e)
{
+e.printStackTrace();
fail();
}
finally {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt TestXMLIntrospector.java
jvanzyl 02/03/09 18:58:29
Modified:betwixt/src/test/org/apache/commons/betwixt
TestXMLIntrospector.java
Log:
The default behaviour is now to take primitive values from elements, so just
fixing this test to take primitive values from attributes as this what's this
is the feature this test exercises.
Revision ChangesPath
1.7 +6 -5
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestXMLIntrospector.java
Index: TestXMLIntrospector.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestXMLIntrospector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestXMLIntrospector.java 9 Feb 2002 12:05:23 - 1.6
+++ TestXMLIntrospector.java 10 Mar 2002 02:58:29 - 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestXMLIntrospector.java,v
1.6 2002/02/09 12:05:23 rdonkin Exp $
- * $Revision: 1.6 $
- * $Date: 2002/02/09 12:05:23 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestXMLIntrospector.java,v
1.7 2002/03/10 02:58:29 jvanzyl Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/03/10 02:58:29 $
*
*
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
- * $Id: TestXMLIntrospector.java,v 1.6 2002/02/09 12:05:23 rdonkin Exp $
+ * $Id: TestXMLIntrospector.java,v 1.7 2002/03/10 02:58:29 jvanzyl Exp $
*/
package org.apache.commons.betwixt;
@@ -72,7 +72,7 @@
/** Test harness for the XMLIntrospector
*
* @author a href=mailto:[EMAIL PROTECTED];James Strachan/a
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class TestXMLIntrospector extends AbstractTestCase {
@@ -90,6 +90,7 @@
public void testIntrospector() throws Exception {
XMLIntrospector introspector = new XMLIntrospector();
+introspector.setAttributesForPrimitives(true);
Object bean = createBean();
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt Project.java TestProjectRoundTrip.java project.xml TestAll.java
jvanzyl 02/03/09 18:59:24
Modified:betwixt/src/test/org/apache/commons/betwixt TestAll.java
Added: betwixt/src/test/org/apache/commons/betwixt Project.java
TestProjectRoundTrip.java project.xml
Log:
Adding some more beans for testing, starting out with a scaled down version
of the maven project bean and will work up to have it mapping completely
so I can toss the mapper that I made.
Updated TestAll to include the new project mapping test.
Revision ChangesPath
1.8 +6 -5
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestAll.java
Index: TestAll.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestAll.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestAll.java 25 Feb 2002 22:04:24 - 1.7
+++ TestAll.java 10 Mar 2002 02:59:24 - 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestAll.java,v
1.7 2002/02/25 22:04:24 rdonkin Exp $
- * $Revision: 1.7 $
- * $Date: 2002/02/25 22:04:24 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/TestAll.java,v
1.8 2002/03/10 02:59:24 jvanzyl Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/03/10 02:59:24 $
*
*
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
- * $Id: TestAll.java,v 1.7 2002/02/25 22:04:24 rdonkin Exp $
+ * $Id: TestAll.java,v 1.8 2002/03/10 02:59:24 jvanzyl Exp $
*/
package org.apache.commons.betwixt;
@@ -70,7 +70,7 @@
/** Entry point for all JUnit tests.
*
* @author a href=mailto:[EMAIL PROTECTED];James Strachan/a
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class TestAll extends TestCase {
@@ -84,6 +84,7 @@
suite.addTest(TestXMLIntrospector.suite());
suite.addTest(TestXMLBeanInfoDigester.suite());
suite.addTest(TestRSSRoundTrip.suite());
+suite.addTest(TestProjectRoundTrip.suite());
return suite;
}
1.1
jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/Project.java
Index: Project.java
===
/*
* $Header:
/home/cvs/jakarta-commons-sandbox/betwixt/src/test/org/apache/commons/betwixt/Project.java,v
1.1 2002/03/10 02:59:24 jvanzyl Exp $
* $Revision: 1.1 $
* $Date: 2002/03/10 02:59:24 $
*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project, Commons, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA
cvs commit: jakarta-commons-sandbox/graph build.xml
jvanzyl 02/01/22 12:21:57
Modified:graphbuild.xml
Log:
- removed the reference to MinML, I copied this from JJAR.
Revision ChangesPath
1.3 +1 -5 jakarta-commons-sandbox/graph/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons-sandbox/graph/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 16 Jan 2002 20:38:28 - 1.2
+++ build.xml 22 Jan 2002 20:21:57 - 1.3
@@ -1,7 +1,7 @@
project name=Jakarta Graph Utilities default=jar basedir=.
!--
-$Id: build.xml,v 1.2 2002/01/16 20:38:28 jvanzyl Exp $
+$Id: build.xml,v 1.3 2002/01/22 20:21:57 jvanzyl Exp $
--
!-- == Initialize Properties === --
@@ -110,10 +110,6 @@
description=Create binary distribution
mkdir dir=${dist.home}/
copy file=LICENSE todir=${dist.home}/
-
-!-- make a complete jar w/ the MinML2 SAX stuff --
-unzip src=${minml2.jar} dest=${build.home}/class/
-delete dir=${build.home}/class/META-INF quiet=true/
jar jarfile=${dist.home}/${component.jar}
basedir=${build.home}/class
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/util build.xml
jvanzyl 02/01/22 12:23:54
Modified:util build.xml
Log:
- removed reference to MinML, build file was probably copied from JJAR.
Revision ChangesPath
1.6 +165 -169 jakarta-commons-sandbox/util/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons-sandbox/util/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 28 Nov 2001 10:12:29 - 1.5
+++ build.xml 22 Jan 2002 20:23:54 - 1.6
@@ -1,87 +1,87 @@
-project name=Jakarta Commons Utilities default=jar basedir=.
-
-!--
-$Id: build.xml,v 1.5 2001/11/28 10:12:29 dlr Exp $
---
-
-!-- == Initialize Properties === --
-
-
+project name=Jakarta Commons Utilities default=jar basedir=.
+
+!--
+$Id: build.xml,v 1.6 2002/01/22 20:23:54 jvanzyl Exp $
+--
+
+!-- == Initialize Properties === --
+
+
property file=./build.properties/ !-- Component loc --
- property file=../build.properties/ !-- Commons local --
- property file=${user.home}/build.properties/ !-- User local--
-
-
-!-- == Classpaths == --
-
- path id=compile.classpath
-pathelement location=${build.home}/class/
- /path
-
+ property file=../build.properties/ !-- Commons local --
+ property file=${user.home}/build.properties/ !-- User local--
+
+
+!-- == Classpaths == --
+
+ path id=compile.classpath
+pathelement location=${build.home}/class/
+ /path
+
path id=servlet.classpath
path refid=compile.classpath/
path location=jsdk.jar/
/path
- path id=test.classpath
-pathelement location=${build.home}/class/
-pathelement location=${build.home}/test/
-pathelement location=${junit.jar}/
- /path
-
+ path id=test.classpath
+pathelement location=${build.home}/class/
+pathelement location=${build.home}/test/
+pathelement location=${junit.jar}/
+ /path
+
path id=servlet.classpath
pathelement location=${servlet.jar} /
/path
-
-!-- == Executable Targets == --
-
- target name=init
-description=Initialize and evaluate conditionals
-echo message= ${component.name} ${component.version} /
-filter token=name value=${component.name}/
-filter token=version value=${component.version}/
-
-available
- classname=junit.framework.TestCase
- property=junit.present
- classpathref=test.classpath/
+
+!-- == Executable Targets == --
+
+ target name=init
+description=Initialize and evaluate conditionals
+echo message= ${component.name} ${component.version} /
+filter token=name value=${component.name}/
+filter token=version value=${component.version}/
+
+available
+ classname=junit.framework.TestCase
+ property=junit.present
+ classpathref=test.classpath/
available
classname=javax.servlet.http.HttpServletRequest
property=servlet.request.present
classpathref=servlet.classpath/
- /target
-
-
- target name=prepare depends=init
-description=Prepare build directory
-mkdir dir=${build.home}/
-mkdir dir=${build.home}/class/
-mkdir dir=${build.home}/conf/
-mkdir dir=${build.home}/test/
- /target
-
-
- target name=static depends=prepare
-description=Copy static files to build directory
-tstamp/
- /target
-
- target name=compile depends=static
- description=Compile shareable components
-
-javac srcdir=${source.home}/java
+ /target
+
+
+ target name=prepare depends=init
+description=Prepare build directory
+mkdir dir=${build.home}/
+mkdir dir=${build.home}/class/
+mkdir dir=${build.home}/conf/
+mkdir dir=${build.home}/test/
+ /target
+
+
+ target name=static depends=prepare
+description=Copy static files to build directory
+tstamp/
+ /target
+
+ target name=compile depends=static
+ description=Compile shareable components
+
+javac srcdir=${source.home}/java
excludes=org/apache/commons/util/http/RequestUtils.java,
org/apache/commons/util/http/ExtendedBrowserDetector.java
- destdir=${build.home}/class
- debug=${compile.debug}
- deprecation=${compile.deprecation}
- optimize=${compile.optimize}
- classpath refid=compile.classpath
cvs commit: jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/algo - New directory
jvanzyl 02/01/16 12:25:16 jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/algo - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/exception - New directory
jvanzyl 02/01/16 12:25:33 jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/exception - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/rupert/src/java/org/apache/commons/rupert/christoph FileTool.java
jvanzyl 01/12/06 05:50:50
Modified:rupert/src/java/org/apache/commons/rupert/christoph
FileTool.java
Log:
- deprecating methods moved to commons-util FileUtils class
Revision ChangesPath
1.2 +12 -1
jakarta-commons-sandbox/rupert/src/java/org/apache/commons/rupert/christoph/FileTool.java
Index: FileTool.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/rupert/src/java/org/apache/commons/rupert/christoph/FileTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileTool.java 2001/06/19 11:43:12 1.1
+++ FileTool.java 2001/12/06 13:50:50 1.2
@@ -73,7 +73,7 @@
*
* @company Deutsches Zentrum fuer Luft- und Raumfahrtp
* @author [EMAIL PROTECTED]
- * @version $Id: FileTool.java,v 1.1 2001/06/19 11:43:12 geirm Exp $
+ * @version $Id: FileTool.java,v 1.2 2001/12/06 13:50:50 jvanzyl Exp $
*/
public class FileTool
{
@@ -97,6 +97,7 @@
/**
* Returns the directory path portion of a file specification string.
* Matches the equally named unix command.
+ * @deprecated Moved to commons-util FileUtils
* @return The directory portion excluding the ending file separator.
*/
public static String dirname(String filename)
@@ -107,6 +108,7 @@
/**
* Returns the filename portion of a file specification string.
+ * @deprecated Moved to commons-util FileUtils
* @return The filename string with extension.
*/
public static String filename(String filename)
@@ -118,6 +120,7 @@
/**
* Returns the filename portion of a file specification string.
* Matches the equally named unix command.
+ * @deprecated Moved to commons-util FileUtils
* @return The filename string without extension.
*/
public static String basename(String filename)
@@ -128,6 +131,7 @@
/**
* Returns the filename portion of a file specification string.
* Matches the equally named unix command.
+ * @deprecated Moved to commons-util FileUtils
*/
public static String basename(String filename, String suffix)
{
@@ -147,6 +151,7 @@
* Returns the extension portion of a file specification string.
* This everything after the last dot '.' in the filename (including
* the dot).
+ * @deprecated Moved to commons-util FileUtils
*/
public static String extension(String filename)
{
@@ -161,6 +166,7 @@
/**
* Check if a file exits.
*
+ * @deprecated Moved to commons-util FileUtils
* @param fileName The name of the file to check.
* @return true if file exists.
*/
@@ -173,6 +179,7 @@
/**
* Reads the contents of a file.
*
+ * @deprecated Moved to commons-util FileUtils
* @param fileName The name of the file to read.
* @return The file contents or null if read failed.
*/
@@ -195,6 +202,7 @@
/**
* Writes data to a file. The file will be created if it does not exist.
*
+ * @deprecated Moved to commons-util FileUtils
* @param fileName The name of the file to write.
* @param data The content to write to the file.
*/
@@ -208,6 +216,7 @@
/**
* Deletes a file.
*
+ * @deprecated Moved to commons-util FileUtils
* @param fileName The name of the file to delete.
*/
public static void fileDelete(String fileName)
@@ -219,6 +228,7 @@
/**
* Waits for NFS to propagate a file creation, imposing a timeout.
*
+ * @deprecated Moved to commons-util FileUtils
* @param fileName The name of the file.
* @param seconds The maximum time in seconds to wait.
* @return True if file exists.
@@ -254,6 +264,7 @@
/**
* Creates a file handle.
*
+ * @deprecated Moved to commons-util FileUtils
* @param fileName The name of the file.
* @return A codeFile/code instance.
*/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph DFS.java
jvanzyl 01/12/01 11:02:07
Modified:graph/src/java/org/apache/commons/graph DFS.java
Log:
- adding definition for completeness.
Revision ChangesPath
1.3 +8 -1
jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/DFS.java
Index: DFS.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/DFS.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DFS.java 2001/11/29 14:17:33 1.2
+++ DFS.java 2001/12/01 19:02:07 1.3
@@ -59,8 +59,15 @@
/**
* Visit graph with depth first search and mark discovery and finishing time in all
* vertices.
+ *
+ * Definition of a DFS:
+ * (1) Any search algorithm which considers outgoing edges of a vertex before
+ * any neighbors of the vertex, that is, outgoing edges of the vertex's predecessor
in
+ * the search. Extremes are searched first. This is easily implemented with
recursion.
+ * (2) An algorithm which marks all vertices in a directed graph in the order they
are
+ * discovered and finished, partitioning the graph into a forest.
*
- * @version $Id: DFS.java,v 1.2 2001/11/29 14:17:33 jvanzyl Exp $
+ * @version $Id: DFS.java,v 1.3 2001/12/01 19:02:07 jvanzyl Exp $
* @author A HREF=http://www.inf.fu-berlin.de/~dahm;M. Dahm/A
*/
public class DFS extends TraversalOrder {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph BFS.java
jvanzyl 01/12/01 11:03:59
Modified:graph/src/java/org/apache/commons/graph BFS.java
Log:
- definition for completeness.
Revision ChangesPath
1.3 +6 -1
jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/BFS.java
Index: BFS.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/BFS.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BFS.java 2001/11/29 14:17:33 1.2
+++ BFS.java 2001/12/01 19:03:59 1.3
@@ -63,7 +63,12 @@
* so that it performs Dijkstra's shortest-path algorithm, for
* instance, if you extend the VQueue class to a Priority Queue.
*
- * @version $Id: BFS.java,v 1.2 2001/11/29 14:17:33 jvanzyl Exp $
+ * Definition of BFS: A search algorithm which considers neighbors of a vertex,
+ * that is, outgoing edges of the vertex's predecessor in the search, before any
+ * outgoing edges of the vertex. Extremes are searched last. This is typically
+ * implemented with a queue.
+ *
+ * @version $Id: BFS.java,v 1.3 2001/12/01 19:03:59 jvanzyl Exp $
* @author A HREF=http://www.inf.fu-berlin.de/~dahm;M. Dahm/A
*/
public class BFS extends TraversalOrder {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/visitor DFSVisitor.java
jvanzyl 01/12/01 11:12:14
Modified:graph/src/java/org/apache/commons/graph/visitor
DFSVisitor.java
Log:
- making comments javadocs, adding some braces.
Revision ChangesPath
1.2 +23 -4
jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/visitor/DFSVisitor.java
Index: DFSVisitor.java
===
RCS file:
/home/cvs/jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/visitor/DFSVisitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DFSVisitor.java 2001/11/29 14:17:34 1.1
+++ DFSVisitor.java 2001/12/01 19:12:14 1.2
@@ -65,22 +65,37 @@
* this class (and of course its descendants) may be passed to a DFS
* object.
*
- * @version $Id: DFSVisitor.java,v 1.1 2001/11/29 14:17:34 jvanzyl Exp $
+ * @version $Id: DFSVisitor.java,v 1.2 2001/12/01 19:12:14 jvanzyl Exp $
* @author A HREF=http://www.inf.fu-berlin.de/~dahm;M. Dahm/A
* @see DFS
*/
public class DFSVisitor extends DefaultVisitor {
- private inttime; // Global time
- private VStack stack; // Stack to remember predecessors
+
+ /**
+ * Global time.
+ */
+ private int time;
+
+ /**
+ * Stack to remember predecessors.
+ */
+ private VStack stack;
- public DFSVisitor() {}
+ /**
+ * Default constructor.
+ */
+ public DFSVisitor()
+ {
+ }
public void discoverGraph(Graph g) {
int size = g.getNoVertices();
Vertex[] vertices = g.getVertexArray();
for(int i=0; i size; i++)
+{
vertices[i].setPredecessor(null);
+}
time = 0; // Reset timer
stack = new VStack(size);
@@ -88,9 +103,13 @@
public void discoverVertex(Vertex v) {
if(stack.empty()) // First node
+{
v.setPredecessor(null);
+}
else
+{
v.setPredecessor(stack.top());
+}
stack.push(v);
v.setDiscoveryTime(time++);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/visualize - New directory
jvanzyl 01/11/29 06:23:02 jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/visualize - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/graph - Imported sources
jvanzyl 01/11/12 08:05:22 Log: Graph Package Status: Vendor Tag: jakarta-commons Release Tags: CG_0_1 N jakarta-commons-sandbox/graph/LICENSE N jakarta-commons-sandbox/graph/PROPOSAL N jakarta-commons-sandbox/graph/README.txt N jakarta-commons-sandbox/graph/build.properties N jakarta-commons-sandbox/graph/build.xml N jakarta-commons-sandbox/graph/.cvsignore N jakarta-commons-sandbox/graph/src/conf/MANIFEST.MF N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/BFS.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/BFSVisitor.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/Constants.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/DaVinciVisualizer.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/DefaultVisitor.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/DFS.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/DFSVisitor.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/Edge.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/GMLVisualizer.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/GraphAlgorithms.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/GraphError.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/Graph.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/GraphVisualizer.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/LabeledEdge.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/LabeledVertex.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/PrintVisitor.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/SCCVisitor.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/Sequential.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/TraversalOrder.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/VCGVisualizer.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/Vertex.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/Visitor.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/VQueue.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/VStack.java N jakarta-commons-sandbox/graph/src/java/org/apache/commons/graph/WeightedEdge.java No conflicts created by this import -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
