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 [6/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/factory/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/factory/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>
@@ -25,9 +43,9 @@
<li>internal class loader repository, which can be specified in resources,</li>
<li>optional class specific factories, which can be used for customized instantiation, and</li>
<li>integration with the Pool Service supporting recycling of instances created by the service.</li>
-</ul>
+</ul>
</section>
-
+
<section name="Configuration">
<p>
@@ -174,7 +192,7 @@
service.getInstance("javax.xml.parsers.DocumentBuilder");
]]></source>
- </section>
+ </section>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/factory/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/factory/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/factory/">
@@ -16,4 +34,4 @@
<item name="Tasks" href="/tasks.html"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/factory/xdocs/tasks.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/factory/xdocs/tasks.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/factory/xdocs/tasks.xml (original)
+++ jakarta/turbine/fulcrum/trunk/factory/xdocs/tasks.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>
@@ -22,7 +40,7 @@
Document using different classloaders.
</li>
</ul>
- </p>
+ </p>
</subsection>
</section>
Modified: jakarta/turbine/fulcrum/trunk/groovy/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/maven.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?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:install" xmlns:ant="jelly:ant">
<!-- ################################################################## -->
@@ -10,7 +29,7 @@
<ant:fileset dir="${basedir}/temp">
<ant:include name="*.txt" />a
</ant:fileset>
- </ant:delete>
+ </ant:delete>
</postGoal>
</project>
Modified: jakarta/turbine/fulcrum/trunk/groovy/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/project.properties Fri May 4 23:58:06 2007
@@ -1,2 +1,18 @@
+# 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.
# display the date on the site
-maven.xdoc.date = left
\ No newline at end of file
+maven.xdoc.date = left
Modified: jakarta/turbine/fulcrum/trunk/groovy/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/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-groovy</id>
@@ -6,7 +24,7 @@
<currentVersion>1.0.1-dev</currentVersion>
<dependencies>
-
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -31,7 +49,7 @@
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
</dependency>
-
+
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyAvalonContext.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyAvalonContext.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyAvalonContext.java (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyAvalonContext.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.groovy;
/*
- * 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.File;
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyRunnable.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyRunnable.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyRunnable.java (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyRunnable.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.groovy;
/*
- * 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.
*/
/**
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyService.java (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/GroovyService.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.groovy;
/*
- * 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;
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyAvalonContextImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyAvalonContextImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyAvalonContextImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyAvalonContextImpl.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.groovy.impl;
/*
- * 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.File;
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyBaseService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyBaseService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyBaseService.java (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyBaseService.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.groovy.impl;
/*
- * 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.File;
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyRunnableImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyRunnableImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyRunnableImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyRunnableImpl.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.groovy.impl;
/*
- * 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 org.apache.commons.lang.Validate;
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyScriptCache.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyScriptCache.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyScriptCache.java (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyScriptCache.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.groovy.impl;
/*
- * 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.util.Hashtable;
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyScriptCacheEntry.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyScriptCacheEntry.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyScriptCacheEntry.java (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyScriptCacheEntry.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.groovy.impl;
/*
- * 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.
*/
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovySemaphore.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovySemaphore.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovySemaphore.java (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovySemaphore.java Fri May 4 23:58:06 2007
@@ -3,20 +3,22 @@
import org.apache.avalon.framework.logger.Logger;
/*
- * 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.
*/
/**
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyServiceImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyServiceImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyServiceImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/java/org/apache/fulcrum/groovy/impl/GroovyServiceImpl.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.groovy.impl;
/*
- * 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 groovy.lang.Binding;
@@ -122,7 +124,7 @@
*/
public void reconfigure(Configuration cfg) throws ConfigurationException
{
- super.reconfigure(cfg);
+ super.reconfigure(cfg);
this.scriptCache.clear();
this.configure(cfg);
}
@@ -218,7 +220,7 @@
{
this.getLogger().debug( this.dumpResult(scriptName,result) );
}
-
+
return result;
}
@@ -240,7 +242,7 @@
*/
public boolean exists(String scriptName)
{
- if( this.getResourceManagerService().exists(this.getDomain()) &&
+ if( this.getResourceManagerService().exists(this.getDomain()) &&
this.getResourceManagerService().exists(this.getDomain(), scriptName) )
{
return true;
@@ -478,7 +480,7 @@
/**
* Create a signature dump of the script invocation to ease debugging.
- *
+ *
* @param scriptName the name of the script
* @param args the parameters passed to the script
* @return the debug output
@@ -537,7 +539,7 @@
/**
* Create a result dump of the script invocation to ease debugging.
- *
+ *
* @param scriptName the name of the script
* @param result the result of the script execution
* @return the debug output
@@ -546,23 +548,23 @@
protected String dumpResult( String scriptName, Object result )
{
StringBuffer resultSignature = new StringBuffer();
-
+
resultSignature.append( "Groovy" );
resultSignature.append( "#" );
resultSignature.append( scriptName );
resultSignature.append( "(" );
-
+
if( result == null )
{
resultSignature.append( "<null>" );
}
else
- {
+ {
resultSignature.append( "result=" );
resultSignature.append( result.getClass().getName() );
resultSignature.append( "[" );
-
+
String temp = result.toString();
if( temp.length() > MAX_LINE_LENGTH )
@@ -576,14 +578,14 @@
resultSignature.append( temp );
}
}
-
+
resultSignature.append( "]" );
resultSignature.append( ")" );
-
+
return resultSignature.toString();
}
-
+
/////////////////////////////////////////////////////////////////////////
// Generated getters/setters
/////////////////////////////////////////////////////////////////////////
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/TestComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,25 @@
<?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>
-
+
<ResourceManagerService>
<domain name="groovy" type="org.apache.fulcrum.resourcemanager.impl.FileResourceManager">
<suffix>groovy</suffix>
@@ -9,7 +27,7 @@
<useLocator>true</useLocator>
</domain>
</ResourceManagerService>
-
+
<GroovyService useCache="true" domain="groovy"/>
-</componentConfig>
\ No newline at end of file
+</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/TestNoCacheComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/TestNoCacheComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/TestNoCacheComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/TestNoCacheComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,25 @@
<?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>
-
+
<ResourceManagerService>
<domain name="groovy" type="org.apache.fulcrum.resourcemanager.impl.FileResourceManager">
<suffix>groovy</suffix>
@@ -9,7 +27,7 @@
<useLocator>true</useLocator>
</domain>
</ResourceManagerService>
-
+
<GroovyService useCache="false" domain="groovy"/>
-</componentConfig>
\ No newline at end of file
+</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/TestRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,21 +1,39 @@
<?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
name="org.apache.fulcrum.resourcemanager.ResourceManagerService"
default-class="org.apache.fulcrum.resourcemanager.impl.ResourceManagerServiceImpl"
- shorthand="ResourceManagerService"
+ shorthand="ResourceManagerService"
early-init="true"
description="Handles the management of resources"
/>
-
+
<role
name="org.apache.fulcrum.groovy.GroovyService"
default-class="org.apache.fulcrum.groovy.impl.GroovyServiceImpl"
- shorthand="GroovyService"
+ shorthand="GroovyService"
early-init="true"
description="Handles the execution of Groovy scripts"
- />
-
-</role-list>
\ No newline at end of file
+ />
+
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/org/apache/fulcrum/groovy/GroovyServiceTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/org/apache/fulcrum/groovy/GroovyServiceTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/org/apache/fulcrum/groovy/GroovyServiceTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/org/apache/fulcrum/groovy/GroovyServiceTest.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.groovy;
/*
- * 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 org.apache.avalon.framework.component.ComponentException;
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/parameters.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/parameters.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/parameters.properties (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/parameters.properties Fri May 4 23:58:06 2007
@@ -1 +1,17 @@
-FOO=BAR
\ No newline at end of file
+# 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.
+FOO=BAR
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/bogus.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/bogus.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/bogus.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/bogus.groovy Fri May 4 23:58:06 2007
@@ -1,2 +1,20 @@
+/*
+ * 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.
+ */
Integer foo = null;
return foo*10;
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/buggy.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/buggy.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/buggy.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/buggy.groovy Fri May 4 23:58:06 2007
@@ -1 +1,19 @@
-forr ( int i=0; i<10; i++) System.out.println( "Hello World" );
\ No newline at end of file
+/*
+ * 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.
+ */
+forr ( int i=0; i<10; i++) System.out.println( "Hello World" );
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/empty.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/empty.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/empty.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/empty.groovy Fri May 4 23:58:06 2007
@@ -1 +1,19 @@
-return true;
\ No newline at end of file
+/*
+ * 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.
+ */
+return true;
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/foo/bar/bar.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/foo/bar/bar.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/foo/bar/bar.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/foo/bar/bar.groovy Fri May 4 23:58:06 2007
@@ -1 +1,19 @@
-return "BAR";
\ No newline at end of file
+/*
+ * 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.
+ */
+return "BAR";
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/foo/foo.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/foo/foo.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/foo/foo.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/foo/foo.groovy Fri May 4 23:58:06 2007
@@ -1 +1,19 @@
-return "FOO";
\ No newline at end of file
+/*
+ * 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.
+ */
+return "FOO";
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/karma.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/karma.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/karma.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/karma.groovy 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.
+ */
import java.io.File;
def getVerse() {
@@ -23,4 +41,4 @@
println "\nAs a single string ...\n"
println myFile.readLines().join(" | ")
-myFile.delete();
\ No newline at end of file
+myFile.delete();
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/stress.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/stress.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/stress.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/stress.groovy 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.
+ */
/**
* Copyright 2004 Apache Software Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +35,7 @@
* @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
*
*/
-
+
import java.io.File;
import java.util.Properties;
import java.io.FileOutputStream;
@@ -43,4 +61,4 @@
Integer result = foo*10;
assert( result == 20 );
-return result;
\ No newline at end of file
+return result;
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/test.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/test.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/test.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/test.groovy 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.
+ */
/**
* Copyright 2004 Apache Software Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +42,7 @@
* @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
*
*/
-
+
import java.io.File;
import java.util.Properties;
import java.io.FileOutputStream;
@@ -61,7 +79,7 @@
assert( props.size() == 1 );
-// 4) Store the properties in the temp directory
+// 4) Store the properties in the temp directory
File file = new File( "temp/test.properties" );
FileOutputStream fos = new FileOutputStream( file );
@@ -82,4 +100,4 @@
Integer result = foo*2;
assert( result == foo+foo );
-return result;
\ No newline at end of file
+return result;
Modified: jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/thread.groovy
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/thread.groovy?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/thread.groovy (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/src/test/scripts/thread.groovy 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.
+ */
/**
* Copyright 2004 Apache Software Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +41,7 @@
*
* @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
*/
-
+
Integer foo = (Integer) args[0];
@@ -31,4 +49,4 @@
Thread.sleep(1000);
avalonContext.getLogger().debug( Thread.currentThread().getName() + " - Finished running" );
-return foo;
\ No newline at end of file
+return foo;
Modified: jakarta/turbine/fulcrum/trunk/groovy/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/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 Groovy Service</title>
Modified: jakarta/turbine/fulcrum/trunk/groovy/xdocs/configuration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/xdocs/configuration.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/xdocs/configuration.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/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>
@@ -17,7 +35,7 @@
<role
name="org.apache.fulcrum.resourcemanager.ResourceManagerService"
default-class="org.apache.fulcrum.resourcemanager.impl.ResourceManagerServiceImpl"
- shorthand="ResourceManagerService"
+ shorthand="ResourceManagerService"
early-init="true"
description="Handles the management of resources"
/>
@@ -25,13 +43,13 @@
<role
name="org.apache.fulcrum.groovy.GroovyService"
default-class="org.apache.fulcrum.groovy.impl.GroovyServiceImpl"
- shorthand="GroovyService"
+ shorthand="GroovyService"
early-init="true"
description="Handles the execution of Groovy scripts"
- />
+ />
]]>
- </source>
- </subsection>
+ </source>
+ </subsection>
<subsection name="Component Configuration">
<source>
@@ -43,11 +61,11 @@
<useLocator>true</useLocator>
</domain>
</ResourceManagerService>
-
+
<GroovyService useCache="true" domain="groovy"/>
]]>
</source>
- </subsection>
+ </subsection>
</section>
Modified: jakarta/turbine/fulcrum/trunk/groovy/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/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>
@@ -18,14 +36,14 @@
<p>
It provides the following features:
-
+
<ul>
<li>caching of Groovy scripts to improve performance</li>
<li>thread-safe execution of compiled Groovy scripts</li>
<li>seamless integration with the existing Avalon infrastructure</li>
</ul>
- </p>
-
+ </p>
+
</section>
</body>
Modified: jakarta/turbine/fulcrum/trunk/groovy/xdocs/integration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/xdocs/integration.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/xdocs/integration.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/xdocs/integration.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>
@@ -33,7 +51,7 @@
Object result = null;
Object[] args = { new Integer(2) };
GroovyRunnable runnable = groovyService.createGroovyRunnable( "test.groovy" );
-runnable.setArgs( args1 );
+runnable.setArgs( args1 );
runnable.run();
result = runnable.getResult();
]]>
@@ -44,11 +62,11 @@
<section name="Accessing the GroovyAvalonContext from a Groovy Script">
<p>
The Fulcrum Groovy Service passes a GroovyAvalonContext to the script
- </p>
+ </p>
<p>
A little example how to use those Java objects within a Groovy script
taken from 'src/test/scripts/test.groovy'
- </p>
+ </p>
<source>
<![CDATA[
System.out.println( avalonContext.getApplicationDir() );
@@ -57,28 +75,28 @@
</source>
</section>
-
+
<section name="A Real World Example">
<p>
Our <b>IT20one Invoice20one Enterprise Server</b> creates digitally
- signed invoices and SMIME messages using X.509 certificates. Due to legal
+ signed invoices and SMIME messages using X.509 certificates. Due to legal
requirements we need to archive those documents using commercial archiving
systems.
- </p>
+ </p>
<p>
- What we don't know at this point are the fields and the format for the index files
+ What we don't know at this point are the fields and the format for the index files
since this depends on the customer and the archiving system being used.
- </p>
+ </p>
<p>
Therefore the archiving is done using an event listener which maps the archiving event
- to the name of a Groovy script. The corresponding Groovy script can be easily
+ to the name of a Groovy script. The corresponding Groovy script can be easily
customized without going through the whole release cycle.
- </p>
+ </p>
<p>
And the Groovy scripts looks like Java and behaves like Java - voila!
- </p>
+ </p>
</section>
-
+
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/groovy/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/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="Fulcrum Groovy Service"
href="http://jakarta.apache.org/turbine/fulcrum/yaafi/">
@@ -9,7 +27,7 @@
<item name="Fulcrum" href="http://jakarta.apache.org/turbine/fulcrum/"/>
<item name="Groovy" href="http://groovy.codehaus.org/"/>
</links>
-
+
<menu name="Overview">
<item name="Overview" href="/index.html"/>
<item name="Configuration" href="/configuration.html"/>
Modified: jakarta/turbine/fulcrum/trunk/groovy/xdocs/technical.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/groovy/xdocs/technical.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/groovy/xdocs/technical.xml (original)
+++ jakarta/turbine/fulcrum/trunk/groovy/xdocs/technical.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,28 +31,28 @@
<p>
Currently the implementation of groovy.lang.Script keeps the binding
- (= the parameters you pass to the script) as a member variable. One
+ (= the parameters you pass to the script) as a member variable. One
could call it a feature ... :-(
</p>
-
+
<p>
Running a script with two threads would overwrite the
parameters passed to the script. Therefore the Groovy Service
uses semaphore to enforce the single-threaded execution of
a Groovy script. This still allows executing different scipts
in parallel with multiple threads.
- </p>
-
+ </p>
+
</section>
<section name="Locator">
-
+
<p>
The locator gives you easy customization of Groovy scripts. Let's
say you would like to invoke the script 'magic.groovy' for a customer
'ABC' and 'XYZ' using the following script layout
- </p>
-
+ </p>
+
<source>
<![CDATA[
scripts
@@ -47,15 +65,15 @@
<p>
In the case of invoking 'ABC/magic.groovy' the script 'ABC/magic.groovy' would be executed.
In the case of invoking 'XYZ/magic.groovy' the locator is looking for 'XYZ/magic.groovy'. Since
- it isn't found it steps up a directory to execute 'magic.groovy'. The trick was taken from
+ it isn't found it steps up a directory to execute 'magic.groovy'. The trick was taken from
the Fulcrum XSLT service which uses a simlilar fallback mechanism.
- </p>
-
+ </p>
+
</section>
<section name="Script Management">
<p>
- The Groovy scripts are managesd by the Fulcrum ResourcManager Service. In the
+ The Groovy scripts are managesd by the Fulcrum ResourcManager Service. In the
future this might allow to store the Groovy Scripts in a database.
</p>
</section>
@@ -67,7 +85,7 @@
tinkering with the more advanced features of Groovy.
</p>
</section>
-
+
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/gump.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/gump.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/gump.xml (original)
+++ jakarta/turbine/fulcrum/trunk/gump.xml Fri May 4 23:58:06 2007
@@ -1,23 +1,42 @@
+<?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.
+-->
<module name="jakarta-turbine-fulcrum">
<description>Services Framework</description>
<url href="http://jakarta.apache.org/turbine/fulcrum/"/>
-
+
<cvs repository="jakarta"/>
-
+
<!-- This is really the cvs module. We need to change this but -->
<!-- I will leave this for now until everything works. -->
-
+
<project name="jakarta-turbine-fulcrum">
-
+
<!-- Standard Maven target to produce Javadocs, source -->
<!-- and binary distributions. -->
-
+
<ant buildfile="build-gump.xml" target="jar">
<property name="final.name" value="fulcrum-@@DATE@@"/>
</ant>
-
+
<!-- All Maven projects need Ant and Xerces to build. -->
<depend project="jakarta-ant"/>
<depend project="xml-xerces"/>
@@ -57,7 +76,7 @@
<nag from="turbine-dev@jakarta.apache.org"
to="turbine-dev@jakarta.apache.org"/>
-
+
</project>
-
+
</module>
Modified: jakarta/turbine/fulcrum/trunk/hsqldb/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/hsqldb/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/hsqldb/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/hsqldb/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/hsqldb/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/hsqldb/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/hsqldb/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/hsqldb/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-hsqldb</id>
@@ -6,21 +24,21 @@
<currentVersion>1.0-dev</currentVersion>
<dependencies>
-
+
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.1</version>
<url>http://hsqldb.sourceforge.net/</url>
- </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/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLService.java (original)
+++ jakarta/turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLService.java Fri May 4 23:58:06 2007
@@ -3,26 +3,28 @@
import org.apache.avalon.framework.activity.Startable;
/*
- * 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.
*/
/**
* A definition for a HSQLService component which configures a single hsqldb
* database.
- *
+ *
* @author <a href="mailto:pti@elex.be">Peter Tillemans</a>
* @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
*/
@@ -33,24 +35,24 @@
* that the HSQLDB server is fully initialized otherwise we get
* spurious connection exceptions. If the HSQLDB server is not
* upand running within 10 seconds we throw an exception.
- *
+ *
* @see org.apache.avalon.framework.activity.Startable#start()
*/
public void start() throws Exception;
-
+
/**
* Stop the HSQLDB server. The implementation polls to ensure
* that the HSQLDB server has terminated otherwise someone
* could call System.exit() and break the database.
- *
+ *
* @see org.apache.avalon.framework.activity.Startable#stop()
*/
public void stop() throws Exception;
/**
* Check if the server is running
- *
+ *
* @return the state of the hsqldb server
*/
public boolean isRunning();
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/hsqldb/src/java/org/apache/fulcrum/hsqldb/HSQLServiceImpl.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 org.apache.avalon.framework.activity.Disposable;
@@ -63,20 +65,20 @@
* @author <a href="mailto:pti@elex.be">Peter Tillemans</a>
* @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
*/
-public class HSQLServiceImpl
- extends AbstractLogEnabled
+public class HSQLServiceImpl
+ extends AbstractLogEnabled
implements HSQLService, Configurable, Initializable, Startable, Disposable
{
/** the HSQLDB server instance */
private Server server;
-
+
/** the configuration properties */
private HsqlProperties serverProperties;
-
+
/////////////////////////////////////////////////////////////////////////
// Avalon Service Lifecycle Implementation
/////////////////////////////////////////////////////////////////////////
-
+
/**
* Constructor
*/
@@ -84,20 +86,20 @@
{
// nothing to do
}
-
+
public boolean isRunning() {
// return true id server is online
return server.getState() == ServerConstants.SERVER_STATE_ONLINE;
- }
-
+ }
+
/**
* @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
*/
- public void configure(Configuration cfg) throws ConfigurationException
+ public void configure(Configuration cfg) throws ConfigurationException
{
String[] names = cfg.getAttributeNames();
-
- for (int i = 0; i < names.length; i++)
+
+ for (int i = 0; i < names.length; i++)
{
getLogger().debug(names[i] + " --> " + cfg.getAttribute(names[i]));
}
@@ -106,26 +108,26 @@
this.serverProperties.setProperty("server.database.0", cfg.getAttribute("database"));
this.serverProperties.setProperty("server.dbname.0", cfg.getAttribute("dbname"));
this.serverProperties.setProperty("server.trace", cfg.getAttributeAsBoolean("trace"));
- this.serverProperties.setProperty("server.silent", cfg.getAttributeAsBoolean("silent"));
+ this.serverProperties.setProperty("server.silent", cfg.getAttributeAsBoolean("silent"));
this.serverProperties.setProperty("server.port", cfg.getAttribute("port"));
this.serverProperties.setProperty("server.tls", cfg.getAttribute("tls","false"));
}
-
+
/**
* @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize() throws Exception
{
this.server = new Server();
- this.server.setProperties( this.serverProperties );
+ this.server.setProperties( this.serverProperties );
}
-
+
/**
* Starts the HSQLDB server. The implementation polls to ensure
* that the HSQLDB server is fully initialized otherwise we get
* spurious connection exceptions. If the HSQLDB server is not
* upand running within 10 seconds we throw an exception.
- *
+ *
* @see org.apache.avalon.framework.activity.Startable#start()
*/
public void start() throws Exception
@@ -135,30 +137,30 @@
// of this operation, server state must be polled or a subclass of Server
// must be used that overrides the setState method to provide state
// change notification.
-
+
server.start();
-
+
// poll for 10 seconds until HSQLDB is up and running
- this.pollForState( ServerConstants.SERVER_STATE_ONLINE, 100 );
+ this.pollForState( ServerConstants.SERVER_STATE_ONLINE, 100 );
}
/**
* Stop the HSQLDB server. The implementation polls to ensure
* that the HSQLDB server has terminated otherwise someone
* could call System.exit() and break the database.
- *
+ *
* @see org.apache.avalon.framework.activity.Startable#stop()
*/
public void stop() throws Exception
{
- this.server.stop();
-
- // poll for 10 seconds until HSQLDB is down
+ this.server.stop();
+
+ // poll for 10 seconds until HSQLDB is down
- this.pollForState( ServerConstants.SERVER_STATE_SHUTDOWN, 100 );
+ this.pollForState( ServerConstants.SERVER_STATE_SHUTDOWN, 100 );
}
-
+
/**
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
@@ -166,43 +168,43 @@
{
this.server = null;
this.serverProperties = null;
- }
-
+ }
+
/**
* Poll the HSQLDB server for a state change
* @param desiredState the state we are waiting for
* @throws Exception something went wrong
*/
-
+
private void pollForState( int desiredState, int lim )
throws Exception
{
int currentState;
boolean isSuccessful = false;
-
+
this.getLogger().debug( "Polling for state : " + desiredState );
-
+
for( int i=0; i<lim; i++ )
{
currentState = this.server.getState();
-
+
if( desiredState == currentState )
{
isSuccessful = true;
break;
}
-
+
Thread.sleep(100);
}
-
+
if( isSuccessful == false )
{
String msg = "Unable to change the HSQLDB server to state : " + desiredState;
-
+
if( this.server.getServerError() != null )
{
this.getLogger().error( msg, this.server.getServerError() );
-
+
if( this.server.getServerError() instanceof Exception )
{
throw (Exception) this.server.getServerError();
@@ -218,6 +220,6 @@
this.getLogger().error(msg);
throw new RuntimeException( msg );
}
- }
+ }
}
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/hsqldb/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/hsqldb/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/hsqldb/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/hsqldb/src/test/TestComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?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>
<HSQLService database="./src/test/test" dbname="test" trace="true" silent="false" port="9001" tls="false"/>
-</componentConfig>
\ No newline at end of file
+</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/hsqldb/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/hsqldb/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/hsqldb/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/hsqldb/src/test/TestRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?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
@@ -6,4 +25,4 @@
shorthand="HSQLService"
early-init="false"
/>
-</role-list>
\ No newline at end of file
+</role-list>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org