You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/05/05 08:58:51 UTC
svn commit: r535465 [7/49] - in /jakarta/turbine/fulcrum/trunk: ./ bsf/
bsf/src/java/org/apache/fulcrum/bsf/ bsf/src/test/ bsf/xdocs/ cache/
cache/src/java/org/apache/fulcrum/cache/
cache/src/java/org/apache/fulcrum/cache/impl/ cache/src/test/ cache/sr...
Modified: jakarta/turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/hsqldb/src/test/org/apache/fulcrum/hsqldb/HSQLServiceTest.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.hsqldb;
/*
- * Copyright 2004 Apache Software Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.sql.Connection;
@@ -32,7 +34,7 @@
public class HSQLServiceTest extends BaseUnitTest
{
private HSQLService service;
-
+
/**
* Defines the testcase name for JUnit.
*
@@ -58,7 +60,7 @@
fail(e.getMessage());
}
}
-
+
protected Connection getConnection(String db) throws Exception
{
String connectionString = "jdbc:hsqldb:hsql://localhost:9001/" + db;
@@ -73,18 +75,18 @@
* @throws Exception
*/
public void testMe() throws Exception
- {
+ {
Connection conn = null;
-
+
try
{
assertNotNull( "HSQL Service must be available", service);
-
- conn = this.getConnection("test");
+
+ conn = this.getConnection("test");
Statement stmt = conn.createStatement();
stmt.execute("SELECT * FROM TURBINE_USER;");
ResultSet rs = stmt.getResultSet();
-
+
while( rs.next() )
{
String loginName = rs.getString("LOGIN_NAME");
@@ -104,19 +106,19 @@
}
}
}
-
+
public void testIsRunning() throws Exception {
assertTrue("Server was not started", service.isRunning());
service.stop();
- assertFalse("Server is still running", service.isRunning());
+ assertFalse("Server is still running", service.isRunning());
}
public void testShutdown() throws Exception {
- Connection conn = this.getConnection("test");
+ Connection conn = this.getConnection("test");
Statement stmt = conn.createStatement();
- stmt.execute("SHUTDOWN;");
+ stmt.execute("SHUTDOWN;");
assertFalse("Server is still running", service.isRunning());
}
}
Modified: jakarta/turbine/fulcrum/trunk/hsqldb/src/test/test.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/hsqldb/src/test/test.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/hsqldb/src/test/test.properties (original)
+++ jakarta/turbine/fulcrum/trunk/hsqldb/src/test/test.properties Fri May 4 23:58:06 2007
@@ -1,5 +1,21 @@
-#HSQL database
-#Wed Nov 03 17:55:58 CET 2004
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# HSQL database
+# Wed Nov 03 17:55:58 CET 2004
hsqldb.cache_file_scale=1
runtime.gc_interval=0
hsqldb.first_identity=0
Modified: jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/changes.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
<properties>
<title>Fulcrum HSQLDB Service</title>
Modified: jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/index.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
@@ -12,9 +30,9 @@
<section name="Overview">
<p>
This service starts a HSQLDB server instance with a single database.
- </p>
+ </p>
</section>
-
+
<section name="Configuration">
<p>
@@ -26,8 +44,8 @@
<role
name="org.apache.fulcrum.hsqldb.HSQLService"
default-class="org.apache.fulcrum.hsqldb.HSQLServiceImpl"
- shorthand="HSQLService"
- />
+ shorthand="HSQLService"
+ />
]]>
</source>
@@ -44,12 +62,12 @@
</section>
<section name="Usage">
-
+
<p>
Please look at unit test how to access the HSQLDB server.
</p>
- </section>
+ </section>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/hsqldb/xdocs/navigation.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project
name="cache"
href="http://jakarta.apache.org/turbine/fulcrum/cache/">
@@ -10,11 +28,11 @@
<item name="Fulcrum"
href="http://jakarta.apache.org/turbine/fulcrum/"/>
<item name="HSQLDb"
- href="http://hsqldb.sourceforge.net/"/>
+ href="http://hsqldb.sourceforge.net/"/>
</links>
<menu name="Overview">
<item name="Main" href="/index.html"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/intake.dtd
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake.dtd?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake.dtd (original)
+++ jakarta/turbine/fulcrum/trunk/intake.dtd Fri May 4 23:58:06 2007
@@ -1,27 +1,45 @@
-<!--
- Intake XML input constraints DTD
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!--
+ Intake XML input constraints DTD
$Id$
-->
<!ELEMENT input-data (group+)>
-<!ATTLIST input-data
+<!ATTLIST input-data
basePackage CDATA #IMPLIED
>
<!ELEMENT group (field+)>
-<!ATTLIST group
+<!ATTLIST group
key CDATA #REQUIRED
name CDATA #REQUIRED
mapToObject CDATA #IMPLIED
>
<!ELEMENT field (rule*,required-message?)>
-<!ATTLIST field
+<!ATTLIST field
key CDATA #REQUIRED
name CDATA #REQUIRED
- type ( boolean | BigDecimal | short | int | long | float
- | double | BigInteger | byte | char | String | Date
- | StringKey | NumberKey | DateKey | ComboKey ) "String"
+ type ( boolean | BigDecimal | short | int | long | float
+ | double | BigInteger | byte | char | String | Date
+ | StringKey | NumberKey | DateKey | ComboKey ) "String"
onError CDATA #IMPLIED
multiValued ( true | false ) "false"
displayName CDATA #IMPLIED
@@ -31,9 +49,9 @@
defaultValue CDATA #IMPLIED
>
-
+
<!ELEMENT rule (#PCDATA)>
-<!ATTLIST rule
+<!ATTLIST rule
name CDATA #REQUIRED
value CDATA #REQUIRED
>
Modified: jakarta/turbine/fulcrum/trunk/intake/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/intake/maven.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/intake/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/intake/project.properties Fri May 4 23:58:06 2007
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
Modified: jakarta/turbine/fulcrum/trunk/intake/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/intake/project.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project>
<extend>${basedir}/../project.xml</extend>
<id>fulcrum-intake</id>
@@ -8,34 +26,34 @@
<dependencies>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-localization</artifactId>
<version>1.0.6-dev</version>
- </dependency>
-
+ </dependency>
+
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-factory</artifactId>
<version>1.0.3</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-pool</artifactId>
<version>1.0.3</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-parser</artifactId>
<version>1.0.2-dev</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-upload</artifactId>
<version>1.0.3</version>
- </dependency>
-
+ </dependency>
+
<dependency>
- <groupId>commons-fileupload</groupId>
+ <groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.1</version>
</dependency>
@@ -43,22 +61,22 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.1</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
+ <groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.3</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>oro</groupId>
+ <groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
- </dependency>
+ </dependency>
<!-- Needed for compilation -->
@@ -75,12 +93,12 @@
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
</dependency>
-
+
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.4</version>
- </dependency>
+ </dependency>
</dependencies>
<build>
Modified: jakarta/turbine/fulcrum/trunk/intake/src/dtd/intake.dtd
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/dtd/intake.dtd?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
Binary files - no diff available.
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/Intake.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/Intake.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/Intake.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/Intake.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.beans.IntrospectionException;
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeError.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeError.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeError.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeError.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.commons.lang.exception.NestableError;
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeException.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeException.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeException.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeException.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/**
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeRuntimeException.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeRuntimeException.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeRuntimeException.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeRuntimeException.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/**
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeService.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeService.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.beans.IntrospectionException;
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceFacade.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.beans.IntrospectionException;
@@ -27,8 +30,8 @@
*
* This class provides static methods that call related methods of the
* implementation of the IntakeService used by the System, according to
- * the settings in your intake.xml file.
- *
+ * the settings in your intake.xml file.
+ *
* Note: How should a facade class work? It seems to me that maybe it should
* only have a hook into the Avalon Component Manager somehow?
*
@@ -39,7 +42,7 @@
public class IntakeServiceFacade
{
/** Static instance of the intakeService. */
-
+
private static IntakeService intakeService;
private static LocalizationService localizationService;
/**
@@ -171,7 +174,7 @@
{
return (IntakeService) intakeService;
}
-
+
static void setIntakeService(IntakeService service){
intakeService = service;
}
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.beans.IntrospectionException;
@@ -58,12 +61,12 @@
/**
* This service provides access to input processing objects based on an XML
* specification.
- *
+ *
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
- *
+ *
* @avalon.component name="intake"
* @avalon.service type="org.apache.fulcrum.intake.IntakeService"
*/
@@ -105,7 +108,7 @@
/**
* Registers a given group name in the system
- *
+ *
* @param groupName
* The name to register the group under
* @param group
@@ -114,7 +117,7 @@
* The app Data object where the group can be found
* @param checkKey
* Whether to check if the key also exists.
- *
+ *
* @return true if successful, false if not
*/
private boolean registerGroup(String groupName, XmlGroup group,
@@ -160,10 +163,10 @@
/**
* Tries to load a serialized Intake Group file. This can reduce the startup
* time of Turbine.
- *
+ *
* @param serialDataPath
* The path of the File to load.
- *
+ *
* @return A map with appData objects loaded from the file or null if the
* map could not be loaded.
*/
@@ -249,7 +252,7 @@
* Writes a parsed XML map with all the appData groups into a file. This
* will speed up loading time when you restart the Intake Service because it
* will only unserialize this file instead of reloading all of the XML files
- *
+ *
* @param serialDataPath
* The path of the file to write to
* @param appDataElements
@@ -330,7 +333,7 @@
/**
* Gets an instance of a named group either from the pool or by calling the
* Factory Service if the pool is empty.
- *
+ *
* @param groupName
* the name of the group.
* @return a Group instance.
@@ -368,10 +371,10 @@
/**
* Puts a Group back to the pool.
- *
+ *
* @param instance
* the object instance to recycle.
- *
+ *
* @throws IntakeException
* The passed group name does not exist.
*/
@@ -404,10 +407,10 @@
/**
* Gets the current size of the pool for a group.
- *
+ *
* @param groupName
* the name of the group.
- *
+ *
* @throws IntakeException
* The passed group name does not exist.
*/
@@ -428,7 +431,7 @@
/**
* Names of all the defined groups.
- *
+ *
* @return array of names.
*/
public String[] getGroupNames()
@@ -438,7 +441,7 @@
/**
* Gets the key (usually a short identifier) for a group.
- *
+ *
* @param groupName
* the name of the group.
* @return the the key.
@@ -450,7 +453,7 @@
/**
* Gets the group name given its key.
- *
+ *
* @param groupKey
* the key.
* @return groupName the name of the group.
@@ -462,7 +465,7 @@
/**
* Gets the Method that can be used to set a property.
- *
+ *
* @param className
* the name of the object.
* @param propName
@@ -527,7 +530,7 @@
/**
* Gets the Method that can be used to get a property value.
- *
+ *
* @param className
* the name of the object.
* @param propName
@@ -796,7 +799,7 @@
/**
* Avalon component lifecycle method Initializes the service by loading
* default class loaders and customized object factories.
- *
+ *
* @throws InitializationException
* if initialization fails.
*/
@@ -820,7 +823,7 @@
/**
* Avalon component lifecycle method
- *
+ *
* @avalon.dependency type="org.apache.fulcrum.localization.LocalizationService"
*/
public void service(ServiceManager manager) throws ServiceException
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/Retrievable.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/Retrievable.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/Retrievable.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/Retrievable.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/**
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/AbstractNumberField.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/AbstractNumberField.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/AbstractNumberField.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/AbstractNumberField.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.text.DecimalFormatSymbols;
@@ -24,7 +27,7 @@
/**
* Provides helper methods for localizing floating point numbers
- *
+ *
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
* @version $Id: BigDecimalField.java 223047 2004-07-01 11:30:52Z epugh $
*/
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BigDecimalField.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BigDecimalField.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BigDecimalField.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BigDecimalField.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.math.BigDecimal;
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/BooleanField.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.text.ParseException;
@@ -82,12 +85,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -125,7 +128,7 @@
for (int i = 0; i < inputs.length; i++)
{
values[i] = StringUtils.isNotEmpty(inputs[i])
- ? getBoolean(inputs[i]).booleanValue()
+ ? getBoolean(inputs[i]).booleanValue()
: ((Boolean) getEmptyValue()).booleanValue();
}
setTestValue(values);
@@ -133,7 +136,7 @@
else
{
String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
+ setTestValue(StringUtils.isNotEmpty(val)
? getBoolean(val) : (Boolean) getEmptyValue());
}
}
@@ -193,5 +196,5 @@
}
return result;
}
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.text.DateFormat;
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DoubleField.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.commons.lang.StringUtils;
@@ -81,7 +84,7 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
* that deal with primitive types should ensure that they return an
* appropriate value wrapped in the object wrapper class for the
@@ -133,7 +136,7 @@
else
{
String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
+ setTestValue(StringUtils.isNotEmpty(val)
? new Double(canonicalizeDecimalInput(val))
: (Double) getEmptyValue());
}
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.lang.reflect.InvocationTargetException;
@@ -375,7 +378,7 @@
}
/**
- * Returns the <code>Group</code> this field belongs to
+ * Returns the <code>Group</code> this field belongs to
* or <code>null</code> if unknown.
*
* @return The group this field belongs to.
@@ -614,7 +617,7 @@
// set the test value as a String[] which might be replaced by
// the correct type if the input is valid.
setTestValue(parser.getStrings(getKey()));
-
+
try
{
validator.assertValidity(this);
@@ -918,7 +921,7 @@
+ " should doublecheck the mapToProperty Attribute, and"
+ " consult the logs. The Turbine Intake Serice will"
+ " have logged a detailed Message with the error.");
- }
+ }
}
catch (IllegalAccessException e)
{
@@ -979,12 +982,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -1037,5 +1040,5 @@
{
return this.toString();
}
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldFactory.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldFactory.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldFactory.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FieldFactory.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.lang.reflect.Constructor;
@@ -136,7 +139,7 @@
throws IntakeException
{
String fieldClass = f.getFieldClass();
-
+
if (fieldClass != null
&& fieldClass.indexOf('.') == -1)
{
@@ -146,13 +149,13 @@
if (fieldClass != null)
{
Class field;
-
+
try
{
field = Class.forName(fieldClass);
- Constructor constructor =
+ Constructor constructor =
field.getConstructor(new Class[] { XmlField.class, Group.class });
-
+
return (Field)constructor.newInstance(new Object[] { f, g });
}
catch (ClassNotFoundException e)
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.commons.fileupload.FileItem;
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FloatField.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.commons.lang.StringUtils;
@@ -133,7 +136,7 @@
else
{
String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
+ setTestValue(StringUtils.isNotEmpty(val)
? new Float(canonicalizeDecimalInput(val))
: getEmptyValue());
}
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.ArrayList;
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.commons.lang.StringUtils;
@@ -81,12 +84,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -98,7 +101,7 @@
}
else
{
- return (null == getEmptyValue())
+ return (null == getEmptyValue())
? new Integer(0) : getEmptyValue();
}
}
@@ -125,7 +128,7 @@
for (int i = 0; i < inputs.length; i++)
{
values[i] = StringUtils.isNotEmpty(inputs[i])
- ? new Integer(inputs[i]).intValue()
+ ? new Integer(inputs[i]).intValue()
: ((Integer) getEmptyValue()).intValue();
}
setTestValue(values);
@@ -133,9 +136,9 @@
else
{
String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
+ setTestValue(StringUtils.isNotEmpty(val)
? new Integer(val) : (Integer) getEmptyValue());
}
}
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.commons.lang.StringUtils;
@@ -82,12 +85,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -125,7 +128,7 @@
for (int i = 0; i < inputs.length; i++)
{
values[i] = StringUtils.isNotEmpty(inputs[i])
- ? new Long(inputs[i]).longValue()
+ ? new Long(inputs[i]).longValue()
: ((Long) getEmptyValue()).longValue();
}
setTestValue(values);
@@ -133,9 +136,9 @@
else
{
String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
+ setTestValue(StringUtils.isNotEmpty(val)
? new Long(val) : (Long) getEmptyValue());
}
}
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.commons.lang.StringUtils;
@@ -81,12 +84,12 @@
}
/**
- * Provides access to emptyValue such that the value returned will be
+ * Provides access to emptyValue such that the value returned will be
* acceptable as an argument parameter to Method.invoke. Subclasses
- * that deal with primitive types should ensure that they return an
- * appropriate value wrapped in the object wrapper class for the
+ * that deal with primitive types should ensure that they return an
+ * appropriate value wrapped in the object wrapper class for the
* primitive type.
- *
+ *
* @return the value to use when the field is empty or an Object that
* wraps the empty value for primitive types.
*/
@@ -98,8 +101,8 @@
}
else
{
- return (null == getEmptyValue())
- ? new Short((short) 0) : getEmptyValue();
+ return (null == getEmptyValue())
+ ? new Short((short) 0) : getEmptyValue();
}
}
@@ -125,7 +128,7 @@
for (int i = 0; i < inputs.length; i++)
{
values[i] = StringUtils.isNotEmpty(inputs[i])
- ? new Short(inputs[i]).shortValue()
+ ? new Short(inputs[i]).shortValue()
: ((Short) getEmptyValue()).shortValue();
}
setTestValue(values);
@@ -133,9 +136,9 @@
else
{
String val = parser.getString(getKey());
- setTestValue(StringUtils.isNotEmpty(val)
+ setTestValue(StringUtils.isNotEmpty(val)
? new Short(val) : (Short) getEmptyValue());
}
}
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/StringField.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/StringField.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/StringField.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/StringField.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.model;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.commons.lang.StringUtils;
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/package.html
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/package.html?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/package.html (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/package.html Fri May 4 23:58:06 2007
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<html>
<head>
<!-- head part is ignored -->
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/transform/DTDResolver.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/transform/DTDResolver.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/transform/DTDResolver.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/transform/DTDResolver.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.transform;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.IOException;
@@ -57,7 +60,7 @@
{
// Search for DTD
ClassLoader classLoader = this.getClass().getClassLoader();
-
+
InputStream dtdStream =
classLoader.getResourceAsStream("intake.dtd");
Modified: jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/transform/XmlToAppData.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/transform/XmlToAppData.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/transform/XmlToAppData.java (original)
+++ jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/transform/XmlToAppData.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.intake.transform;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.BufferedReader;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org