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 [13/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/s...
Modified: jakarta/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/ParameterParserTest.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.parser;
/*
- * Copyright 2000-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.
*/
@@ -57,15 +60,15 @@
fail(e.getMessage());
}
}
-
+
public void testConfiguredUrlCaseFolding() throws Exception
{
assertTrue(parameterParser.getUrlFolding() == ParameterParser.URL_CASE_FOLDING_NONE);
}
-
+
/**
* Simple test to verify that URL Case Folding works properly
- *
+ *
* @throws Exception
*/
public void testRepositoryExists() throws Exception
@@ -111,6 +114,6 @@
// The following will actually cause a ClassCastException because getStrings() (and others) are not catering for FileItems.
assertNull("The returned should be null because a FileItem is not a String", parameterParser.getStrings("upload-field"));
- assertFalse(parameterParser.containsKey("missing-field"));
+ assertFalse(parameterParser.containsKey("missing-field"));
}
}
Modified: jakarta/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/PropertyBean.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/PropertyBean.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/PropertyBean.java (original)
+++ jakarta/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/PropertyBean.java Fri May 4 23:58:06 2007
@@ -1,140 +1,143 @@
-package org.apache.fulcrum.parser;
-
-/*
- * Copyright 2001-2005 The 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
- *
- * 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.
- */
-
-public class PropertyBean
-{
- private int intValue;
-
- private long longValue;
-
- private double doubleValue;
-
- private String stringValue;
-
- private Boolean booleanValue;
-
- private String doNotTouchValue;
-
- /**
- * Get the LongValue value.
- * @return the LongValue value.
- */
- public long getLongValue()
- {
- return longValue;
- }
-
- /**
- * Set the LongValue value.
- * @param newLongValue The new LongValue value.
- */
- public void setLongValue(long newLongValue)
- {
- this.longValue = newLongValue;
- }
- /**
- * Get the DoubleValue value.
- * @return the DoubleValue value.
- */
- public double getDoubleValue()
- {
- return doubleValue;
- }
-
- /**
- * Set the DoubleValue value.
- * @param newDoubleValue The new DoubleValue value.
- */
- public void setDoubleValue(double newDoubleValue)
- {
- this.doubleValue = newDoubleValue;
- }
-
- /**
- * Get the StringValue value.
- * @return the StringValue value.
- */
- public String getStringValue()
- {
- return stringValue;
- }
-
- /**
- * Set the StringValue value.
- * @param newStringValue The new StringValue value.
- */
- public void setStringValue(String newStringValue)
- {
- this.stringValue = newStringValue;
- }
-
- /**
- * Get the IntValue value.
- * @return the IntValue value.
- */
- public int getIntValue()
- {
- return intValue;
- }
-
- /**
- * Set the BooleanValue value.
- * @param newBooleanValue The new BooleanValue value.
- */
- public void setBooleanValue(Boolean newBooleanValue)
- {
- this.booleanValue = newBooleanValue;
- }
-
- /**
- * Get the BooleanValue value.
- * @return the BooleanValue value.
- */
- public Boolean getBooleanValue()
- {
- return booleanValue;
- }
-
- /**
- * Set the IntValue value.
- * @param newIntValue The new IntValue value.
- */
- public void setIntValue(int newIntValue)
- {
- this.intValue = newIntValue;
- }
-
- /**
- * Get the DoNotTouchValue value.
- * @return the DoNotTouchValue value.
- */
- public String getDoNotTouchValue()
- {
- return doNotTouchValue;
- }
-
- /**
- * Set the DoNotTouchValue value.
- * @param newDoNotTouchValue The new DoNotTouchValue value.
- */
- public void setDoNotTouchValue(String newDoNotTouchValue)
- {
- this.doNotTouchValue = newDoNotTouchValue;
- }
-
-}
+package org.apache.fulcrum.parser;
+
+/*
+ * 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.
+ */
+
+public class PropertyBean
+{
+ private int intValue;
+
+ private long longValue;
+
+ private double doubleValue;
+
+ private String stringValue;
+
+ private Boolean booleanValue;
+
+ private String doNotTouchValue;
+
+ /**
+ * Get the LongValue value.
+ * @return the LongValue value.
+ */
+ public long getLongValue()
+ {
+ return longValue;
+ }
+
+ /**
+ * Set the LongValue value.
+ * @param newLongValue The new LongValue value.
+ */
+ public void setLongValue(long newLongValue)
+ {
+ this.longValue = newLongValue;
+ }
+ /**
+ * Get the DoubleValue value.
+ * @return the DoubleValue value.
+ */
+ public double getDoubleValue()
+ {
+ return doubleValue;
+ }
+
+ /**
+ * Set the DoubleValue value.
+ * @param newDoubleValue The new DoubleValue value.
+ */
+ public void setDoubleValue(double newDoubleValue)
+ {
+ this.doubleValue = newDoubleValue;
+ }
+
+ /**
+ * Get the StringValue value.
+ * @return the StringValue value.
+ */
+ public String getStringValue()
+ {
+ return stringValue;
+ }
+
+ /**
+ * Set the StringValue value.
+ * @param newStringValue The new StringValue value.
+ */
+ public void setStringValue(String newStringValue)
+ {
+ this.stringValue = newStringValue;
+ }
+
+ /**
+ * Get the IntValue value.
+ * @return the IntValue value.
+ */
+ public int getIntValue()
+ {
+ return intValue;
+ }
+
+ /**
+ * Set the BooleanValue value.
+ * @param newBooleanValue The new BooleanValue value.
+ */
+ public void setBooleanValue(Boolean newBooleanValue)
+ {
+ this.booleanValue = newBooleanValue;
+ }
+
+ /**
+ * Get the BooleanValue value.
+ * @return the BooleanValue value.
+ */
+ public Boolean getBooleanValue()
+ {
+ return booleanValue;
+ }
+
+ /**
+ * Set the IntValue value.
+ * @param newIntValue The new IntValue value.
+ */
+ public void setIntValue(int newIntValue)
+ {
+ this.intValue = newIntValue;
+ }
+
+ /**
+ * Get the DoNotTouchValue value.
+ * @return the DoNotTouchValue value.
+ */
+ public String getDoNotTouchValue()
+ {
+ return doNotTouchValue;
+ }
+
+ /**
+ * Set the DoNotTouchValue value.
+ * @param newDoNotTouchValue The new DoNotTouchValue value.
+ */
+ public void setDoNotTouchValue(String newDoNotTouchValue)
+ {
+ this.doNotTouchValue = newDoNotTouchValue;
+ }
+
+}
Modified: jakarta/turbine/fulcrum/trunk/parser/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/parser/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/parser/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 Parser</title>
@@ -9,26 +27,26 @@
<release version="1.0.2-dev" date="in SVN">
<action dev="tv" type="update" issue="TRB-32" due-to="Juergen Hofmann">
Port parser fixes of Turbine 2.3.2 over to the component.
- </action>
+ </action>
<action dev="epugh" type="add">
Add javabean get/set for dependent upload service to DefaultParameterParser.
- </action>
+ </action>
<action dev="epugh" type="add">
Basic unit test verifying that the default parser starts up.
- </action>
+ </action>
<action dev="epugh" type="add">
Change to commons-logger to be more friendly to who ever
uses this code.
- </action>
+ </action>
<action dev="epugh" type="add">
Removed use of old Log4j Category in favor of Logger.
- </action>
+ </action>
<action dev="epugh" type="add">
Make gump friendly.
- </action>
+ </action>
<action dev="epugh" type="add">
Initial conversion to Avalon component.
- </action>
+ </action>
</release>
</body>
Modified: jakarta/turbine/fulcrum/trunk/parser/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/parser/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/parser/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>
@@ -13,14 +31,14 @@
<p>
This Service functions as a Parser component.
</p>
-
+
<p>
- It is written
- for use in Turbine but it can be used in any container compatible
+ It is written
+ for use in Turbine but it can be used in any container compatible
with Avalon's ECM container.
- </p>
+ </p>
</section>
-
+
<section name="Configuration">
<p>
@@ -85,11 +103,11 @@
<p>
You can also place an expiration time on your objects so the Service will
automatically remove them when they expire. If you don't specify an expiration
- time, the Service uses 5 seconds. To see an example, look at the
+ time, the Service uses 5 seconds. To see an example, look at the
test case <a href="xref-test/org/apache/fulcrum/cache/CacheTest.html">CacheTest</a>
</p>
- </section>
+ </section>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/parser/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/parser/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/parser/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/parser/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/">
@@ -15,4 +33,4 @@
<item name="Main" href="/index.html"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/pbe/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pbe/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pbe/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/pbe/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/pbe/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pbe/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pbe/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pbe/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-pbe</id>
@@ -6,21 +24,21 @@
<currentVersion>1.0.0</currentVersion>
<dependencies>
-
+
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.4</version>
</dependency>
-
+
<!-- Needed only for testing -->
-
+
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
</dependency>
-
+
</dependencies>
</project>
Modified: jakarta/turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEService.java (original)
+++ jakarta/turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEService.java Fri May 4 23:58:06 2007
@@ -6,20 +6,22 @@
import java.security.GeneralSecurityException;
/*
- * 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.
*/
@@ -70,7 +72,7 @@
throws GeneralSecurityException, IOException;
/**
- * Creates a smart decrypting input stream.
+ * Creates a smart decrypting input stream.
*
* @param is the input stream to be wrapped
* @param password the password to be used
@@ -175,4 +177,4 @@
*/
String decryptString( String cipherText, char[] password )
throws GeneralSecurityException, IOException;
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEServiceImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEServiceImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEServiceImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/pbe/src/java/org/apache/fulcrum/pbe/PBEServiceImpl.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.pbe;
/*
- * 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.io.IOException;
@@ -47,7 +49,7 @@
{
/** the internally used factory to create cipher streams */
private CryptoStreamFactory cryptoStreamFactory;
-
+
/** the salt for generating the password */
private byte[] passwordSalt;
@@ -76,36 +78,36 @@
throws ConfigurationException
{
// read the parameters for CryptoStreamFactory
-
+
byte[] cryptoSalt = CryptoParameters.SALT;
String crypoAlgorithm = configuration.getChild("cryptoAlgorithm").getValue(CryptoParameters.ALGORITHM);
String cryptoProvider = configuration.getChild("cryptoProvider").getValue(CryptoParameters.PROVIDERNAME);
int cryptoCount = configuration.getChild("cyrptoCount").getValueAsInteger(CryptoParameters.COUNT);
-
+
String tempCryptoSalt = configuration.getChild("cryptoSalt").getValue("");
-
+
if( tempCryptoSalt.length() > 0 )
{
cryptoSalt = HexConverter.toBytes( tempCryptoSalt );
}
-
+
// create the CryptoStreamFactory to be used
-
+
this.cryptoStreamFactory = new CryptoStreamFactoryImpl(
cryptoSalt,
cryptoCount,
crypoAlgorithm,
cryptoProvider
);
-
+
// read the parameters for PasswordFactory
-
+
this.passwordSalt = PasswordParameters.SALT;
this.passwordCount = configuration.getChild("passwordCount").getValueAsInteger(PasswordParameters.COUNT);
this.defaultPassword = PasswordParameters.DEFAULTPASSWORD;
}
-
+
/////////////////////////////////////////////////////////////////////////
// PBE Service Implementation
/////////////////////////////////////////////////////////////////////////
@@ -171,7 +173,7 @@
password
);
}
-
+
/**
* @see org.apache.fulcrum.pbe.PBEService#getSmartInputStream(java.io.InputStream, char[])
*/
@@ -183,7 +185,7 @@
password
);
}
-
+
/**
* @see org.apache.fulcrum.pbe.PBEService#getOutputStream(java.io.OutputStream, char[])
*/
@@ -235,4 +237,4 @@
{
return cryptoStreamFactory;
}
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/pbe/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pbe/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pbe/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pbe/src/test/TestComponentConfig.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.
+-->
<componentConfig>
<PBEService>
Modified: jakarta/turbine/fulcrum/trunk/pbe/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pbe/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pbe/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pbe/src/test/TestRoleConfig.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.
+-->
<role-list>
<role
@@ -8,5 +26,5 @@
early-init="true"
component-type="merlin"
description="Provides Password Based Encyrption using JCA/JCE"
- />
-</role-list>
\ No newline at end of file
+ />
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/pbe/src/test/org/apache/fulcrum/pbe/PBEServiceTest.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.pbe;
/*
- * 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.io.ByteArrayInputStream;
@@ -61,18 +63,18 @@
fail(e.getMessage());
}
}
-
+
protected PBEService getService()
{
return this.service;
}
-
+
protected char[] getPassword()
throws Exception
{
return this.getService().createPassword();
}
-
+
/**
* Pumps the input stream to the output stream.
*
@@ -94,18 +96,18 @@
}
is.close();
-
+
os.flush();
os.close();
- }
-
+ }
+
/////////////////////////////////////////////////////////////////////////
// Start of unit tests
/////////////////////////////////////////////////////////////////////////
- /**
+ /**
* Create the default password do be used
- */
+ */
public void testCreateDefaultPassword() throws Exception
{
char[] result = this.getService().createPassword();
@@ -113,9 +115,9 @@
assertTrue( result.length > 0 );
}
- /**
+ /**
* Create a password with a user-supplied seed value.
- */
+ */
public void testCreatePassword() throws Exception
{
char[] seed = "mysecret".toCharArray();
@@ -124,25 +126,25 @@
assertTrue( result.length > 0 );
}
- /**
- * Test encryption and decryption of Strings
+ /**
+ * Test encryption and decryption of Strings
*/
public void testEncryptDecryptString() throws Exception
{
String source = "Nobody knows the toubles I have seen ...";
String cipherText = this.getService().encryptString( source, this.getPassword() );
String plainText = this.getService().decryptString( cipherText, this.getPassword() );
- assertEquals( source, plainText );
+ assertEquals( source, plainText );
}
-
- /**
+
+ /**
* Test encryption and decryption of binary data using the default password.
- */
+ */
public void testBinaryEncryptDecrypt() throws Exception
{
byte[] source = new byte[256];
byte[] result = null;
-
+
for( int i=0; i<source.length; i++ )
{
source[i] = (byte) i;
@@ -150,43 +152,43 @@
char[] password = this.getService().createPassword();
ByteArrayOutputStream cipherText = new ByteArrayOutputStream();
- ByteArrayOutputStream plainText = new ByteArrayOutputStream();
-
+ ByteArrayOutputStream plainText = new ByteArrayOutputStream();
+
this.getService().encrypt( source, cipherText, password );
this.getService().decrypt( cipherText, plainText, password );
-
- result = plainText.toByteArray();
-
+
+ result = plainText.toByteArray();
+
for( int i=0; i<source.length; i++ )
{
if( source[i] != result[i] )
{
fail( "Binary data are different - the test failed" );
}
- }
- }
-
+ }
+ }
+
public void testStreamCiphers() throws Exception
{
String source = "Nobody knows the toubles I have seen ...";
byte[] cipherText = null;
- String plainText = null;
+ String plainText = null;
char[] password = this.getPassword();
-
- // encrypt using a CipherOutputStream
+
+ // encrypt using a CipherOutputStream
ByteArrayInputStream bais1 = new ByteArrayInputStream( source.getBytes() );
ByteArrayOutputStream baos1 = new ByteArrayOutputStream();
OutputStream cos = this.getService().getOutputStream( baos1, password );
this.copy( bais1, cos );
cipherText = baos1.toByteArray();
-
- // decrypt using a CipherinputStream
+
+ // decrypt using a CipherinputStream
ByteArrayInputStream bais2 = new ByteArrayInputStream( cipherText );
ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
InputStream cis = this.getService().getInputStream( bais2, password );
this.copy( cis, baos2 );
plainText = new String( baos2.toByteArray() );
-
+
// verify the result
assertEquals( source, plainText );
}
Modified: jakarta/turbine/fulcrum/trunk/pbe/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pbe/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pbe/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pbe/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 PBE Service</title>
@@ -9,8 +27,8 @@
<release version="1.0.0" date="as in CVS">
<action dev="sgoeschl" type="add">
Initial import
- </action>
- </release>
+ </action>
+ </release>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/pbe/xdocs/configuration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pbe/xdocs/configuration.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pbe/xdocs/configuration.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pbe/xdocs/configuration.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 PBE Service</title>
@@ -16,7 +34,7 @@
early-init="true"
component-type="merlin"
description="Provides Password Based Encyrption using JCA/JCE"
-/>
+/>
]]></source>
</subsection>
@@ -65,14 +83,14 @@
<td>int</td>
<td>Y</td>
<td>
- Defines the number of SHA-1 invocations to
+ Defines the number of SHA-1 invocations to
create the password. Changing this value creates
- completely different passwords.
+ completely different passwords.
</td>
- </tr>
+ </tr>
</table>
</subsection>
-
+
<subsection name="Component Configuration Example">
<source><![CDATA[
<PBEService>
@@ -84,7 +102,7 @@
</PBEService>
]]></source>
</subsection>
-
+
</section>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/pbe/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pbe/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pbe/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pbe/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>
@@ -9,31 +27,31 @@
<body>
- <section name="Overview">
-
+ <section name="Overview">
+
<p>
The PBEService (Password Based Encryption Service) supports encryption
and decryption of resources using JCA (Java Crypto Architecture)
- and JCE (Java Crpyto Extension) providing
+ and JCE (Java Crpyto Extension) providing
<ul>
<li>method to create more or less secure passwords</li>
<li>creation of cipher streams for transparent encryption/decryption</li>
<li>generic encryption/decryption methods</li>
- </ul>
+ </ul>
</p>
<p>
The implementation uses PBEWithMD5AndTripleDES and was inspired
- by Pankaj Kumar and his excellent book
+ by Pankaj Kumar and his excellent book
<a href="http://www.j2ee-security.net/">J2EE Security</a>.
</p>
-
+
<p>
The implementation depends directly on the YAAFI libraries since
- the actual implementation is found there.
+ the actual implementation is found there.
</p>
-
+
</section>
</body>
Modified: jakarta/turbine/fulcrum/trunk/pbe/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pbe/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pbe/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pbe/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="pbe"
href="http://jakarta.apache.org/turbine/fulcrum/pbe/">
@@ -8,11 +26,11 @@
<item name="Home" href="../../../it20one-service-maven/target/docs/index.html"/>
<item name="Fulcrum" href="http://jakarta.apache.org/turbine/fulcrum/"/>
</links>
-
+
<menu name="Overview">
<item name="Overview" href="/index.html"/>
<item name="Configuration" href="/configuration.html"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/pool/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pool/maven.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?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">
<!--preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
</preGoal-->
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/pool/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pool/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-pool</id>
@@ -16,20 +34,20 @@
<groupId>fulcrum</groupId>
<artifactId>fulcrum-factory</artifactId>
<version>1.0.3</version>
- </dependency>
-
+ </dependency>
+
<!-- Needed only for testing -->
<dependency>
<groupId>fulcrum</groupId>
<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>
Modified: jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ArrayCtorRecyclable.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ArrayCtorRecyclable.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ArrayCtorRecyclable.java (original)
+++ jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ArrayCtorRecyclable.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * 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/pool/src/java/org/apache/fulcrum/pool/BoundedBuffer.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/BoundedBuffer.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/BoundedBuffer.java (original)
+++ jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/BoundedBuffer.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * 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/pool/src/java/org/apache/fulcrum/pool/DefaultPoolService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/DefaultPoolService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/DefaultPoolService.java (original)
+++ jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/DefaultPoolService.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.pool;
/*
- * 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.Method;
@@ -431,7 +434,7 @@
try
{
Object instance = pollInstance(clazz.getName(), params, signature);
- //FactoryService fs = getFactory();
+ //FactoryService fs = getFactory();
return instance == null ? getFactory().getInstance(clazz.toString(), params, signature) : instance;
}
catch (FactoryException fe)
Modified: jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/InitableRecyclable.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/InitableRecyclable.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/InitableRecyclable.java (original)
+++ jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/InitableRecyclable.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * 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/pool/src/java/org/apache/fulcrum/pool/ObjectInputStreamForContext.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ObjectInputStreamForContext.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ObjectInputStreamForContext.java (original)
+++ jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/ObjectInputStreamForContext.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * 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/pool/src/java/org/apache/fulcrum/pool/PoolException.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/PoolException.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/PoolException.java (original)
+++ jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/PoolException.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.pool;
/*
- * 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/pool/src/java/org/apache/fulcrum/pool/PoolService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/PoolService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/PoolService.java (original)
+++ jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/PoolService.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * 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.
*/
@@ -35,7 +38,7 @@
* @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
* @version $Id$
*/
-public interface PoolService
+public interface PoolService
{
/** Avalon role - used to id the component within the manager */
String ROLE = PoolService.class.getName();
Modified: jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/Recyclable.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/Recyclable.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/Recyclable.java (original)
+++ jakarta/turbine/fulcrum/trunk/pool/src/java/org/apache/fulcrum/pool/Recyclable.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * 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/pool/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pool/src/test/TestComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,8 +1,27 @@
+<?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.
+-->
<componentConfig>
<pool>
<configuration>
<capacity default="256"/>
</configuration>
</pool>
- <factory/>
-</componentConfig>
\ No newline at end of file
+ <factory/>
+</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/pool/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pool/src/test/TestRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,13 +1,32 @@
+<?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.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
name="org.apache.fulcrum.factory.FactoryService"
shorthand="factory"
default-class="org.apache.fulcrum.factory.DefaultFactoryService"
- />
+ />
<role
name="org.apache.fulcrum.pool.PoolService"
shorthand="pool"
default-class="org.apache.fulcrum.pool.DefaultPoolService"
- />
-</role-list>
\ No newline at end of file
+ />
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/pool/src/test/org/apache/fulcrum/pool/PoolServiceTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/src/test/org/apache/fulcrum/pool/PoolServiceTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/src/test/org/apache/fulcrum/pool/PoolServiceTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/pool/src/test/org/apache/fulcrum/pool/PoolServiceTest.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.pool;
/*
- * 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.fulcrum.testcontainer.BaseUnitTest;
@@ -37,14 +40,14 @@
{
super(name);
}
-
+
public void setUp() throws Exception
{
super.setUp();
poolService = (PoolService) this.resolve( PoolService.class.getName() );
}
-
+
/*
* Class to test for Object getInstance(Class)
*/
@@ -52,8 +55,8 @@
{
Object object = poolService.getInstance(StringBuffer.class);
assertTrue(object instanceof StringBuffer);
-
- }
+
+ }
public void testPutInstance()
{
@@ -61,14 +64,14 @@
assertEquals(0, poolService.getSize("java.lang.String"));
poolService.putInstance(s);
assertEquals(1, poolService.getSize("java.lang.String"));
-
+
}
public void testGetSetCapacity()
{
assertEquals(128, poolService.getCapacity("java.lang.String"));
poolService.setCapacity("java.lang.String", 278);
assertEquals(278, poolService.getCapacity("java.lang.String"));
-
+
}
public void testGetSize()
{
@@ -76,7 +79,7 @@
assertEquals(0, poolService.getSize("java.lang.String"));
poolService.putInstance(s);
assertEquals(1, poolService.getSize("java.lang.String"));
-
+
}
/*
* Class to test for void clearPool(String)
@@ -89,7 +92,7 @@
assertEquals(1, poolService.getSize("java.lang.String"));
poolService.clearPool("java.lang.String");
assertEquals(0, poolService.getSize("java.lang.String"));
-
+
}
/*
* Class to test for void clearPool()
@@ -104,6 +107,6 @@
poolService.clearPool();
assertEquals(0, poolService.getSize("java.lang.String"));
assertEquals(0, poolService.getSize("java.lang.Double"));
-
+
}
}
Modified: jakarta/turbine/fulcrum/trunk/pool/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pool/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 Pool Impl</title>
@@ -9,19 +27,19 @@
<release version="1.0.3" date="2004-11-24">
<action dev="epugh" type="update" due-to="Kostyantyn Shchekotykhin">
Merge api and impl jars into one project.
- </action>
+ </action>
<action dev="epugh" type="update">
Clean up dependencies. Use TestContainer.
- </action>
+ </action>
<action dev="epugh" type="update">
Bump versions, clean up dependencies
- </action>
- </release>
+ </action>
+ </release>
<release version="1.0.2" date="in cvs">
<action dev="epugh" type="update">
Update to use Merlin 3.3.0
- </action>
- </release>
+ </action>
+ </release>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/pool/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pool/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>
@@ -42,7 +60,7 @@
used objects having constuctors with parameters.
</p>
</section>
-
+
<section name="Configuration">
<p>
@@ -56,12 +74,12 @@
name="org.apache.fulcrum.pool.PoolService"
shorthand="pool"
default-class="org.apache.fulcrum.pool.DefaultPoolService"/>
-
-
+
+
<role
name="org.apache.fulcrum.factory.FactoryService"
shorthand="factory"
- default-class="org.apache.fulcrum.factory.DefaultFactoryService"/>
+ default-class="org.apache.fulcrum.factory.DefaultFactoryService"/>
]]>
</source>
@@ -75,7 +93,7 @@
<pool>
<capacity default="256"/>
</pool>
-
+
<factory/>
]]>
</source>
@@ -83,7 +101,7 @@
</section>
<section name="Usage">
-
+
<p>
The Pool Service can be called instead of the Factory Service, when instantiating
objects that are needed repeatedly e.g. for processing client requests. Intances
@@ -105,7 +123,7 @@
TurbinePool.putInstance(parser);
]]></source>
- </section>
+ </section>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/pool/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/pool/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/pool/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/pool/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="localization"
href="http://jakarta.apache.org/turbine/fulcrum/pool/">
@@ -15,4 +33,4 @@
<item name="Main" href="/index.html"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/project.properties Fri May 4 23:58:06 2007
@@ -1,9 +1,25 @@
-#========================================================================
+# 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.
+# ========================================================================
# You can uncomment this if you're willing to use the unofficial
# Turbine-specific jar repository at the Turbine site. This will
# contain all the jars needed to build Fulcrum, even if a jar
# is missing on ibiblio
-#========================================================================
+# ========================================================================
maven.repo.remote=http://www.ibiblio.org/maven/,http://jakarta.apache.org/turbine/repo
maven.checkstyle.format = turbine
Modified: jakarta/turbine/fulcrum/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/project.xml Fri May 4 23:58:06 2007
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-/*
- * Copyright 2001-2006 The 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
- *
- * 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.
- */
- -->
+ 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>
<pomVersion>3</pomVersion>
@@ -208,7 +209,7 @@
|
| Common compile-time dependencies for all the components.
|
- -->
+ -->
<dependency>
<groupId>avalon-framework</groupId>
@@ -228,7 +229,7 @@
|
| Common test-time dependencies for all the components.
|
- -->
+ -->
<!-- dependency>
<groupId>commons-collections</groupId>
Modified: jakarta/turbine/fulcrum/trunk/quartz/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/quartz/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/quartz/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/quartz/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-quartz</id>
@@ -16,39 +34,39 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.1</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.1.2</version>
<url>http://xstream.codehaus.org/</url>
- </dependency>
-
+ </dependency>
+
<!-- QUARTZ -->
<dependency>
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
<version>1.5.1</version>
- </dependency>
-
+ </dependency>
+
<!-- Needed only for testing -->
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
</dependency>
-
+
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
Modified: jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/QuartzScheduler.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/QuartzScheduler.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/QuartzScheduler.java (original)
+++ jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/QuartzScheduler.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
/*
- * Copyright 2001-2004 The 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
- *
- * 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.
- */
+ * 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.
+ */
package org.apache.fulcrum.quartz;
@@ -24,19 +27,19 @@
* @author <a href="mailto:leandro@ibnetwork.com.br">Leandro Rodrigo Saad Cruz</a>
*
*/
-public interface QuartzScheduler
+public interface QuartzScheduler
{
/** avalon idion */
public static final String ROLE = QuartzScheduler.class.getName();
-
- Scheduler getScheduler();
-
+
+ Scheduler getScheduler();
+
/**
* Map containing JobDetail objects. Key is group.name
* @return
*/
Map getJobDetailsMap();
-
+
/**
* Map containing Trigger objects. Key is group.name
* @return
Modified: jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java (original)
+++ jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java Fri May 4 23:58:06 2007
@@ -1,17 +1,20 @@
/*
- * 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.
*/
package org.apache.fulcrum.quartz.impl;
@@ -219,4 +222,4 @@
return triggersMap;
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org