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 [19/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/script/xdocs/configuration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/xdocs/configuration.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/xdocs/configuration.xml (original)
+++ jakarta/turbine/fulcrum/trunk/script/xdocs/configuration.xml Fri May 4 23:58:06 2007
@@ -1,160 +1,178 @@
-<?xml version="1.0"?>
-
-<document>
-
- <properties>
- <title>Fulcrum Script Service</title>
- <author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
- </properties>
-
- <body>
-
- <section name="Configuration">
-
- <subsection name="Component Configuration">
- <table>
- <tr>
- <th>Item</th>
- <th>Datatype</th>
- <th>Cardinality</th>
- <th>Description</th>
- </tr>
- <tr>
- <td>scriptEngines</td>
- <td>Complex</td>
- <td>[1]</td>
- <td>
- The list of available script engines
- </td>
- </tr>
- <tr>
- <td>scriptEngines\scriptEngine</td>
- <td>Complex</td>
- <td>[1..n]</td>
- <td>
- Metadata about a particular script engine
- </td>
- </tr>
- <tr>
- <td>scriptEngines\scriptEngine\name</td>
- <td>String</td>
- <td>[1]</td>
- <td>
- The name of the script engine to lookup the implementation
- using the ScriptEngineManager.getEngineByName()
- </td>
- </tr>
- <tr>
- <td>scriptEngines\scriptEngine\isCached</td>
- <td>boolean</td>
- <td>[0|1]</td>
- <td>
- Is the script cached or reloaded from the resource service
- each time? This setting is useful for debugging when you edit
- the script on the fly since the changes take place immediatly.
- </td>
- </tr>
- <tr>
- <td>scriptEngines\scriptEngine\isCompiled</td>
- <td>boolean</td>
- <td>[0|1]</td>
- <td>
- Is the script compiled to an internal representation before being
- executed. Using a compiled script improves the performance together
- with cached scripts (see above)
- </td>
- </tr>
- <tr>
- <td>scriptEngines\scriptEngine\location</td>
- <td>String</td>
- <td>[0|1]</td>
- <td>
- The location of the scripts regarding the resource service. If no
- value is supplied than <name> is used.
- </td>
- </tr>
- <tr>
- <td>scriptEngines\scriptEngine\preLoad</td>
- <td>Complex</td>
- <td>[0|1]</td>
- <td>
- A list of scripts to preload during startup.
- </td>
- </tr>
- <tr>
- <td>scriptEngines\scriptEngine\preLoad\script</td>
- <td>String</td>
- <td>[0..n]</td>
- <td>
- A script to preload during startup.
- </td>
- </tr>
- <tr>
- <td>scriptConfiguration</td>
- <td>Complex</td>
- <td>[0|1]</td>
- <td>
- Contains the user-defined configuration to pass
- to the executed script using the AvalonScriptContext.
- </td>
- </tr>
- </table>
- </subsection>
-
- <subsection name="Component Configuration Example">
-
- <source>
- <![CDATA[
-<ResourceManagerService>
- <domain name="js">
- <suffix>js</suffix>
- <location>./src/test/scripts/js</location>
- <useLocator>true</useLocator>
- </domain>
-</ResourceManagerService>
-
-<ScriptService>
- <scriptEngines>
- <scriptEngine>
- <name>js</name>
- <isCached>true</isCached>
- <isCompiled>true</isCompiled>
- <location>js</location>
- <preLoad>
- <script>InvocableIntf.js</script>
- </preLoad>
- </scriptEngine>
- </scriptEngines>
- <scriptConfiguration>
- <isDebug>true</isDebug>
- </scriptConfiguration>
-</ScriptService>
- ]]>
- </source>
- </subsection>
-
- <subsection name="Role Configuration Example">
- <source>
- <![CDATA[
-<role
- name="org.apache.fulcrum.resourcemanager.ResourceManagerService"
- default-class="org.apache.fulcrum.resourcemanager.impl.ResourceManagerServiceImpl"
- shorthand="ResourceManagerService"
- early-init="true"
- description="Handles the management of resources"
- />
-<role
- name="org.apache.fulcrum.script.ScriptService"
- default-class="org.apache.fulcrum.script.impl.ScriptServiceImpl"
- shorthand="ScriptService"
- early-init="true"
- description="Handles the execution of scripts"
- />
- ]]>
- </source>
- </subsection>
- </section>
-
- </body>
-
-</document>
+<?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 Script Service</title>
+ <author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
+ </properties>
+
+ <body>
+
+ <section name="Configuration">
+
+ <subsection name="Component Configuration">
+ <table>
+ <tr>
+ <th>Item</th>
+ <th>Datatype</th>
+ <th>Cardinality</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>scriptEngines</td>
+ <td>Complex</td>
+ <td>[1]</td>
+ <td>
+ The list of available script engines
+ </td>
+ </tr>
+ <tr>
+ <td>scriptEngines\scriptEngine</td>
+ <td>Complex</td>
+ <td>[1..n]</td>
+ <td>
+ Metadata about a particular script engine
+ </td>
+ </tr>
+ <tr>
+ <td>scriptEngines\scriptEngine\name</td>
+ <td>String</td>
+ <td>[1]</td>
+ <td>
+ The name of the script engine to lookup the implementation
+ using the ScriptEngineManager.getEngineByName()
+ </td>
+ </tr>
+ <tr>
+ <td>scriptEngines\scriptEngine\isCached</td>
+ <td>boolean</td>
+ <td>[0|1]</td>
+ <td>
+ Is the script cached or reloaded from the resource service
+ each time? This setting is useful for debugging when you edit
+ the script on the fly since the changes take place immediatly.
+ </td>
+ </tr>
+ <tr>
+ <td>scriptEngines\scriptEngine\isCompiled</td>
+ <td>boolean</td>
+ <td>[0|1]</td>
+ <td>
+ Is the script compiled to an internal representation before being
+ executed. Using a compiled script improves the performance together
+ with cached scripts (see above)
+ </td>
+ </tr>
+ <tr>
+ <td>scriptEngines\scriptEngine\location</td>
+ <td>String</td>
+ <td>[0|1]</td>
+ <td>
+ The location of the scripts regarding the resource service. If no
+ value is supplied than <name> is used.
+ </td>
+ </tr>
+ <tr>
+ <td>scriptEngines\scriptEngine\preLoad</td>
+ <td>Complex</td>
+ <td>[0|1]</td>
+ <td>
+ A list of scripts to preload during startup.
+ </td>
+ </tr>
+ <tr>
+ <td>scriptEngines\scriptEngine\preLoad\script</td>
+ <td>String</td>
+ <td>[0..n]</td>
+ <td>
+ A script to preload during startup.
+ </td>
+ </tr>
+ <tr>
+ <td>scriptConfiguration</td>
+ <td>Complex</td>
+ <td>[0|1]</td>
+ <td>
+ Contains the user-defined configuration to pass
+ to the executed script using the AvalonScriptContext.
+ </td>
+ </tr>
+ </table>
+ </subsection>
+
+ <subsection name="Component Configuration Example">
+
+ <source>
+ <![CDATA[
+<ResourceManagerService>
+ <domain name="js">
+ <suffix>js</suffix>
+ <location>./src/test/scripts/js</location>
+ <useLocator>true</useLocator>
+ </domain>
+</ResourceManagerService>
+
+<ScriptService>
+ <scriptEngines>
+ <scriptEngine>
+ <name>js</name>
+ <isCached>true</isCached>
+ <isCompiled>true</isCompiled>
+ <location>js</location>
+ <preLoad>
+ <script>InvocableIntf.js</script>
+ </preLoad>
+ </scriptEngine>
+ </scriptEngines>
+ <scriptConfiguration>
+ <isDebug>true</isDebug>
+ </scriptConfiguration>
+</ScriptService>
+ ]]>
+ </source>
+ </subsection>
+
+ <subsection name="Role Configuration Example">
+ <source>
+ <![CDATA[
+<role
+ name="org.apache.fulcrum.resourcemanager.ResourceManagerService"
+ default-class="org.apache.fulcrum.resourcemanager.impl.ResourceManagerServiceImpl"
+ shorthand="ResourceManagerService"
+ early-init="true"
+ description="Handles the management of resources"
+ />
+<role
+ name="org.apache.fulcrum.script.ScriptService"
+ default-class="org.apache.fulcrum.script.impl.ScriptServiceImpl"
+ shorthand="ScriptService"
+ early-init="true"
+ description="Handles the execution of scripts"
+ />
+ ]]>
+ </source>
+ </subsection>
+ </section>
+
+ </body>
+
+</document>
Modified: jakarta/turbine/fulcrum/trunk/script/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/script/xdocs/index.xml Fri May 4 23:58:06 2007
@@ -1,66 +1,84 @@
-<?xml version="1.0"?>
-
-<document>
-
- <properties>
- <title>Fulcrum Script Service</title>
- <author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
- </properties>
-
- <body>
-
- <section name="What is the Fulcrum Script Service?">
-
- <p>
- The Fulcrum Script Service provides an integration of the
- JSR 223 specifiation to integrate scripting languages.
- Basically this is the successor of the existing Fulcrum BSF
- and Fulcrum Groovy service.
- </p>
-
- <subsection name="Features">
- <p>
- The Fulcrum Script Service provides the following features:
- <ul>
- <li>optional caching of scripts to improve performance</li>
- <li>optional script compilation depending on the scripting engine</li>
- <li>seamless integration with the existing Avalon infrastructure</li>
- </ul>
- </p>
- </subsection>
-
- <subsection name="Scripting Language Support">
- <table>
- <tr>
- <th>Language</th>
- <th>Status</th>
- <th>Description</th>
- </tr>
- <tr>
- <td><a href="http://www.mozilla.org/rhino">Rhino JavaScript</a></td>
- <td>Done</td>
- <td>Works nicely</td>
- </tr>
- <tr>
- <td><a href="http://groovy.codehaus.org">Groovy</a></td>
- <td>Done</td>
- <td>Currently no support for Invocable</td>
- </tr>
- <tr>
- <td><a href="https://pnuts.dev.java.net">pnuts</a></td>
- <td>Open</td>
- <td>Currently no JDK 1.4 support for JSR 223 integration</td>
- </tr>
- <tr>
- <td><a href="http://www.beanshell.org">Beanshell</a></td>
- <td>Open</td>
- <td>Currently no JSR 223 integration available</td>
- </tr>
- </table>
- </subsection>
-
- </section>
-
- </body>
-
-</document>
+<?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 Script Service</title>
+ <author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
+ </properties>
+
+ <body>
+
+ <section name="What is the Fulcrum Script Service?">
+
+ <p>
+ The Fulcrum Script Service provides an integration of the
+ JSR 223 specifiation to integrate scripting languages.
+ Basically this is the successor of the existing Fulcrum BSF
+ and Fulcrum Groovy service.
+ </p>
+
+ <subsection name="Features">
+ <p>
+ The Fulcrum Script Service provides the following features:
+ <ul>
+ <li>optional caching of scripts to improve performance</li>
+ <li>optional script compilation depending on the scripting engine</li>
+ <li>seamless integration with the existing Avalon infrastructure</li>
+ </ul>
+ </p>
+ </subsection>
+
+ <subsection name="Scripting Language Support">
+ <table>
+ <tr>
+ <th>Language</th>
+ <th>Status</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td><a href="http://www.mozilla.org/rhino">Rhino JavaScript</a></td>
+ <td>Done</td>
+ <td>Works nicely</td>
+ </tr>
+ <tr>
+ <td><a href="http://groovy.codehaus.org">Groovy</a></td>
+ <td>Done</td>
+ <td>Currently no support for Invocable</td>
+ </tr>
+ <tr>
+ <td><a href="https://pnuts.dev.java.net">pnuts</a></td>
+ <td>Open</td>
+ <td>Currently no JDK 1.4 support for JSR 223 integration</td>
+ </tr>
+ <tr>
+ <td><a href="http://www.beanshell.org">Beanshell</a></td>
+ <td>Open</td>
+ <td>Currently no JSR 223 integration available</td>
+ </tr>
+ </table>
+ </subsection>
+
+ </section>
+
+ </body>
+
+</document>
Modified: jakarta/turbine/fulcrum/trunk/script/xdocs/integration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/xdocs/integration.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/xdocs/integration.xml (original)
+++ jakarta/turbine/fulcrum/trunk/script/xdocs/integration.xml Fri May 4 23:58:06 2007
@@ -1,75 +1,93 @@
-<?xml version="1.0"?>
-
-<document>
-
- <properties>
- <title>Fulcrum Script Service</title>
- <author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
- </properties>
-
- <body>
-
- <section name="Invoking a script">
-
- <p>
- For invoking a script you have two options - either you invoke the
- script directly using the ScriptService or you can use a ScriptRunnable
- (which relies on the ScriptService).
- </p>
-
- <subsection name="Using the ScriptService">
- <p>
- This example invokes a script called "CompilableInterface" and
- passed two parameters for executing the script.
- </p>
- <source>
- <![CDATA[
-Object result = null;
-SimpleNamespace args = new SimpleNamespace();
-args.put("count",new Integer(i));
-args.put("currentTime",new Long(System.currentTimeMillis()));
-result = scriptService.eval("CompilableInterface", args);
- ]]>
- </source>
- </subsection>
-
- <subsection name="Using the ScriptRunnable">
- <p>
- This example creates a ScriptRunnable to invoke a
- script called "MultiThreaded".
- </p>
- <source>
- <![CDATA[
-Hashtable args = new Hashtable();
-args.put("foo", new Double(0));
-ScriptRunnable runnable = scriptService.createRunnable( scriptService, "MultiThreaded", args );
-runnable.run();
-result = runnable.getResult();
- ]]>
- </source>
- </subsection>
-
- </section>
-
- <section name="Accessing Avalon Infrastructure from within a script">
- <p>
- The Fulcrum Script Service passes a ScriptAvalonContext to the script
- </p>
- <source>
- <![CDATA[
-var logger = avalonContext.getLogger();
-var applicationDir = avalonContext.getApplicationDir();
-var tempDir = avalonContext.getTempDir();
-var serviceManager = avalonContext.getServiceManager();
-var parameters = avalonContext.getParameters();
-var configuration = avalonContext.getConfiguration();
-var isDebug = configuration.getChild("isDebug").getValueAsBoolean(false);
-serviceManager.lookup("org.apache.fulcrum.script.ScriptService").exists("Avalon");
- ]]>
- </source>
-
- </section>
-
- </body>
-
-</document>
+<?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 Script Service</title>
+ <author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
+ </properties>
+
+ <body>
+
+ <section name="Invoking a script">
+
+ <p>
+ For invoking a script you have two options - either you invoke the
+ script directly using the ScriptService or you can use a ScriptRunnable
+ (which relies on the ScriptService).
+ </p>
+
+ <subsection name="Using the ScriptService">
+ <p>
+ This example invokes a script called "CompilableInterface" and
+ passed two parameters for executing the script.
+ </p>
+ <source>
+ <![CDATA[
+Object result = null;
+SimpleNamespace args = new SimpleNamespace();
+args.put("count",new Integer(i));
+args.put("currentTime",new Long(System.currentTimeMillis()));
+result = scriptService.eval("CompilableInterface", args);
+ ]]>
+ </source>
+ </subsection>
+
+ <subsection name="Using the ScriptRunnable">
+ <p>
+ This example creates a ScriptRunnable to invoke a
+ script called "MultiThreaded".
+ </p>
+ <source>
+ <![CDATA[
+Hashtable args = new Hashtable();
+args.put("foo", new Double(0));
+ScriptRunnable runnable = scriptService.createRunnable( scriptService, "MultiThreaded", args );
+runnable.run();
+result = runnable.getResult();
+ ]]>
+ </source>
+ </subsection>
+
+ </section>
+
+ <section name="Accessing Avalon Infrastructure from within a script">
+ <p>
+ The Fulcrum Script Service passes a ScriptAvalonContext to the script
+ </p>
+ <source>
+ <![CDATA[
+var logger = avalonContext.getLogger();
+var applicationDir = avalonContext.getApplicationDir();
+var tempDir = avalonContext.getTempDir();
+var serviceManager = avalonContext.getServiceManager();
+var parameters = avalonContext.getParameters();
+var configuration = avalonContext.getConfiguration();
+var isDebug = configuration.getChild("isDebug").getValueAsBoolean(false);
+serviceManager.lookup("org.apache.fulcrum.script.ScriptService").exists("Avalon");
+ ]]>
+ </source>
+
+ </section>
+
+ </body>
+
+</document>
Modified: jakarta/turbine/fulcrum/trunk/script/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/script/xdocs/navigation.xml Fri May 4 23:58:06 2007
@@ -1,21 +1,39 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project
- name="Fulcrum Groovy Service"
- href="http://jakarta.apache.org/turbine/fulcrum/yaafi/">
-
- <body>
- <links>
- <item name="Home" href="../../../it20one-service-maven/target/docs/index.html"/>
- <item name="Fulcrum" href="http://jakarta.apache.org/turbine/fulcrum/"/>
- <item name="JSR 223" href="http://www.jcp.org/aboutJava/communityprocess/pr/jsr223/"/>
- </links>
-
- <menu name="Overview">
- <item name="Overview" href="/index.html"/>
- <item name="Configuration" href="/configuration.html"/>
- <item name="Integration" href="/integration.html"/>
- <item name="Technical" href="/technical.html"/>
- <item name="Resources" href="/resources.html"/>
- </menu>
- </body>
-</project>
+<?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/">
+
+ <body>
+ <links>
+ <item name="Home" href="../../../it20one-service-maven/target/docs/index.html"/>
+ <item name="Fulcrum" href="http://jakarta.apache.org/turbine/fulcrum/"/>
+ <item name="JSR 223" href="http://www.jcp.org/aboutJava/communityprocess/pr/jsr223/"/>
+ </links>
+
+ <menu name="Overview">
+ <item name="Overview" href="/index.html"/>
+ <item name="Configuration" href="/configuration.html"/>
+ <item name="Integration" href="/integration.html"/>
+ <item name="Technical" href="/technical.html"/>
+ <item name="Resources" href="/resources.html"/>
+ </menu>
+ </body>
+</project>
Modified: jakarta/turbine/fulcrum/trunk/script/xdocs/resources.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/xdocs/resources.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/xdocs/resources.xml (original)
+++ jakarta/turbine/fulcrum/trunk/script/xdocs/resources.xml Fri May 4 23:58:06 2007
@@ -1,21 +1,39 @@
-<?xml version="1.0"?>
-
-<document>
-
- <properties>
- <title>Fulcrum Script Service</title>
- <author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
- </properties>
-
- <body>
-
- <section name="Resources">
- <ul>
- <li><a href="http://opal.cabochon.com/~stevey/sokoban/">Stevey's JVM Language Soko-Shootout</a></li>
- <li><a href="http://www.javaworld.com/javaworld/jw-03-2005/jw-0314-scripting.html">Choosing a Java scripting language</a></li>
- </ul>
- </section>
-
- </body>
-
-</document>
+<?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 Script Service</title>
+ <author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
+ </properties>
+
+ <body>
+
+ <section name="Resources">
+ <ul>
+ <li><a href="http://opal.cabochon.com/~stevey/sokoban/">Stevey's JVM Language Soko-Shootout</a></li>
+ <li><a href="http://www.javaworld.com/javaworld/jw-03-2005/jw-0314-scripting.html">Choosing a Java scripting language</a></li>
+ </ul>
+ </section>
+
+ </body>
+
+</document>
Modified: jakarta/turbine/fulcrum/trunk/script/xdocs/technical.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/script/xdocs/technical.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/script/xdocs/technical.xml (original)
+++ jakarta/turbine/fulcrum/trunk/script/xdocs/technical.xml Fri May 4 23:58:06 2007
@@ -1,61 +1,79 @@
-<?xml version="1.0"?>
-
-<document>
-
- <properties>
- <title>Fulcrum Script Service</title>
- <author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
- </properties>
-
- <body>
-
- <section name="Script Compilation">
- <p>
- Depending on the ScriptEngine of your choice you have
- various options to compile a script
- <ul>
- <li>transforming the script into an AST (abstract syntax tree) on the fly</li>
- <li>compiling the script into Java bytecode on the fly thereby creating a Java class dynamically</li>
- <li>precompile the script to Java bytecode thereby creating a Java class file</li>
- </ul>
- </p>
- </section>
-
- <section name="Script Management">
- <p>
- The scripts are managesd by the Fulcrum ResourcManager Service. This
- gives you the locator functionality, optional decryption and location
- transparency
- </p>
- </section>
-
- <section name="Locator">
-
- <p>
- The locator gives you easy customization of scripts. Let's
- say you would like to invoke the script 'foo.js' for a customer
- 'BAR' using the following script layout
- </p>
-
- <source>
- <![CDATA[
-scripts
- -- foo.js
- -- BAR
- -- foo.js
- ]]>
- </source>
-
- <p>
- In the case of invoking 'foo.js' the script 'foo.js' would be executed.
- In the case of invoking 'BAR/foo.js' the script 'BAR/foo.js' would be executed.
- In the case of invoking 'FOO/foo.js' the locator is looking for 'FOO/foo.js'. Since
- it isn't found it steps up a directory to execute 'foo.js'. The trick was taken from
- the Fulcrum XSLT service which uses a simlilar fallback mechanism.
- </p>
-
- </section>
-
- </body>
-
-</document>
+<?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 Script Service</title>
+ <author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
+ </properties>
+
+ <body>
+
+ <section name="Script Compilation">
+ <p>
+ Depending on the ScriptEngine of your choice you have
+ various options to compile a script
+ <ul>
+ <li>transforming the script into an AST (abstract syntax tree) on the fly</li>
+ <li>compiling the script into Java bytecode on the fly thereby creating a Java class dynamically</li>
+ <li>precompile the script to Java bytecode thereby creating a Java class file</li>
+ </ul>
+ </p>
+ </section>
+
+ <section name="Script Management">
+ <p>
+ The scripts are managesd by the Fulcrum ResourcManager Service. This
+ gives you the locator functionality, optional decryption and location
+ transparency
+ </p>
+ </section>
+
+ <section name="Locator">
+
+ <p>
+ The locator gives you easy customization of scripts. Let's
+ say you would like to invoke the script 'foo.js' for a customer
+ 'BAR' using the following script layout
+ </p>
+
+ <source>
+ <![CDATA[
+scripts
+ -- foo.js
+ -- BAR
+ -- foo.js
+ ]]>
+ </source>
+
+ <p>
+ In the case of invoking 'foo.js' the script 'foo.js' would be executed.
+ In the case of invoking 'BAR/foo.js' the script 'BAR/foo.js' would be executed.
+ In the case of invoking 'FOO/foo.js' the locator is looking for 'FOO/foo.js'. Since
+ it isn't found it steps up a directory to execute 'foo.js'. The trick was taken from
+ the Fulcrum XSLT service which uses a simlilar fallback mechanism.
+ </p>
+
+ </section>
+
+ </body>
+
+</document>
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/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:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/project.properties Fri May 4 23:58:06 2007
@@ -1,3 +1,19 @@
+# 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.
maven.multiproject.type=jar
maven.junit.usefile=true
maven.junit.fork=true
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/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-security-adapter-opensymphony</id>
@@ -6,53 +24,53 @@
<dependencies>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
<version>1.0.7</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-crypto</artifactId>
<version>1.0.5</version>
</dependency>
-
+
<dependency>
<groupId>cryptix</groupId>
<artifactId>cryptix</artifactId>
<version>3.2.0</version>
<url>http://www.cryptix.org/</url>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
- </dependency>
+ </dependency>
<!-- Needed only for the OSUser Adapter -->
<dependency>
<groupId>opensymphony</groupId>
<artifactId>osuser</artifactId>
- <version>1.0-20060106</version>
+ <version>1.0-20060106</version>
</dependency>
<dependency>
<groupId>opensymphony</groupId>
<artifactId>propertyset</artifactId>
<version>1.3</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>opensymphony</groupId>
<artifactId>oscore</artifactId>
<version>2.2.4</version>
- </dependency>
-
-
+ </dependency>
+
+
<!-- testing -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-security-memory</artifactId>
<version>1.0.7</version>
- </dependency>
-
+ </dependency>
+
</dependencies>
@@ -70,12 +88,12 @@
<include>**/Abstract*.*</include>
</excludes>
<resources>
- <resource>
+ <resource>
<directory>${basedir}/src/test</directory>
<includes>
<include>**/*.x*</include>
</includes>
- </resource>
+ </resource>
<resource>
<directory>${basedir}/src/java</directory>
<includes>
@@ -89,7 +107,7 @@
<include>block.xml</include>
</includes>
</resource>
- </resources>
+ </resources>
</unitTest>
<resources>
<resource>
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/BaseFulcrumProvider.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/BaseFulcrumProvider.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/BaseFulcrumProvider.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/BaseFulcrumProvider.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.osuser;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.Properties;
@@ -30,7 +33,7 @@
* provide access from OSUser to the Fulcrum Security implementation.
* Currently, to change things you should use the Fulcrum Security system
* directly, this is a very mimimal implementation.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -44,7 +47,7 @@
/*
* Does nothing for now.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#create(java.lang.String)
*/
public boolean create(String arg0)
@@ -54,7 +57,7 @@
/*
* Does nothign for now.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#flushCaches()
*/
public void flushCaches()
@@ -65,7 +68,7 @@
/*
* Doesn't do anything. Init isn't required as the Fulcrum Security is
* assumed to be running in an Avalon container.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#init(java.util.Properties)
*/
public boolean init(Properties arg0)
@@ -75,7 +78,7 @@
/*
* Sets the accessor to be mutable, and returns true.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#load(java.lang.String,
* com.opensymphony.user.Entity.Accessor)
*/
@@ -88,7 +91,7 @@
/*
* Returns false, this doesn't do anything.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#remove(java.lang.String)
*/
public boolean remove(String arg0)
@@ -98,7 +101,7 @@
/*
* Returns false, this doesn't do anything right now.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#store(java.lang.String,
* com.opensymphony.user.Entity.Accessor)
*/
@@ -109,7 +112,7 @@
/**
* Lazy loads the SecurityService.
- *
+ *
* @return
*/
public SecurityService getSecurityService() throws DataBackendException
@@ -128,11 +131,11 @@
}
return securityService;
}
-
+
/**
* The Fulcrum Security Service that will back the Fulcrum
* providers.
- *
+ *
* @param securityService
* The securityService to set.
*/
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/FulcrumAccessProvider.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/FulcrumAccessProvider.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/FulcrumAccessProvider.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/FulcrumAccessProvider.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.osuser;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.ArrayList;
@@ -34,7 +37,7 @@
* whether a user exists in a role. In OSUser, there are no roles, just groups,
* so this maps Fulcrum roles on OSUser groups. This means some the the method
* names refer to groups, but interact with Fulcrum roles.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -44,10 +47,10 @@
{
/** Logging */
private static Log log = LogFactory.getLog(FulcrumAccessProvider.class);
-
+
/*
* Not implemented. Should use SecurityService directly.
- *
+ *
* @see com.opensymphony.user.provider.AccessProvider#addToGroup(java.lang.String,
* java.lang.String)
*/
@@ -62,7 +65,7 @@
* assignable to groups, then what this method really checks is that the
* user has a specific role. </strong> This is because the mapping between
* OSUser and Fulcurm Security is not a 1 to 1 mapping.
- *
+ *
* @see com.opensymphony.user.provider.AccessProvider#inGroup(java.lang.String,
* java.lang.String)
*/
@@ -74,7 +77,7 @@
DynamicAccessControlList acl =
(DynamicAccessControlList)getSecurityService().getUserManager().getACL(user);
Role role = acl.getRoles().getRoleByName(groupname);
- boolean result =acl.hasRole(role);
+ boolean result =acl.hasRole(role);
return result;
}
catch (UnknownEntityException uee)
@@ -91,7 +94,7 @@
/*
* This returns all the ROLES that a user has. This is similar to the
* problems with the inGroup() method of this provider.
- *
+ *
* @see com.opensymphony.user.provider.AccessProvider#listGroupsContainingUser(java.lang.String)
* @see org.apache.fulcrum.security.adapter.osuser.FulcrumAccessProvider#inGroup(java.lang.String,java.lang.String)
*/
@@ -104,7 +107,7 @@
DynamicAccessControlList acl =
(DynamicAccessControlList)getSecurityService().getUserManager().getACL(user);
roles.addAll(acl.getRoles().getNames());
-
+
}
catch (UnknownEntityException uee)
{
@@ -120,7 +123,7 @@
/*
* Not implemented yet.
- *
+ *
* @see com.opensymphony.user.provider.AccessProvider#listUsersInGroup(java.lang.String)
*/
public List listUsersInGroup(String groupname)
@@ -130,7 +133,7 @@
/*
* Not implemented. Should probably use SecurityService directly.
- *
+ *
* @see com.opensymphony.user.provider.AccessProvider#removeFromGroup(java.lang.String,
* java.lang.String)
*/
@@ -141,7 +144,7 @@
/*
* Not implemented. Should use SecurityService directly.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#create(java.lang.String)
*/
public boolean create(String name)
@@ -151,7 +154,7 @@
/*
* Doesn't do anything.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#flushCaches()
*/
public void flushCaches()
@@ -161,7 +164,7 @@
/*
* Returns true if the user exists, otherwise returns false.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#handles(java.lang.String)
*/
public boolean handles(String name)
@@ -185,7 +188,7 @@
/*
* not implemented.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#list()
*/
public List list()
@@ -197,7 +200,7 @@
/*
* Not implemented. Should use SecurityService directly.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#remove(java.lang.String)
*/
public boolean remove(String name)
@@ -207,12 +210,12 @@
/*
* Not implemented. Should use SecurityService directly.
- *
+ *
* @see com.opensymphony.user.provider.UserProvider#store(java.lang.String,
* com.opensymphony.user.Entity.Accessor)
*/
public boolean store(String arg0, Accessor arg1)
- {
+ {
return false;
}
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/FulcrumCredentialsProvider.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/FulcrumCredentialsProvider.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/FulcrumCredentialsProvider.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/java/org/apache/fulcrum/security/adapter/osuser/FulcrumCredentialsProvider.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.osuser;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.List;
@@ -29,7 +32,7 @@
* Fulcrum provider for OSUser. Primarily provides support for authenticating a
* user. This delegates to whatever authenticator is configured in the
* getSecurityService().
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id: FulcrumCredentialsProvider.java,v 1.2 2003/10/21 10:16:29
* epugh Exp $
@@ -40,11 +43,11 @@
{
/*
- * Authenticate a user with their password.
- *
- * @see com.opensymphony.user.provider.CredentialsProvider#authenticate(java.lang.String,
- * java.lang.String)
- */
+ * Authenticate a user with their password.
+ *
+ * @see com.opensymphony.user.provider.CredentialsProvider#authenticate(java.lang.String,
+ * java.lang.String)
+ */
public boolean authenticate(String name, String password)
{
try
@@ -69,21 +72,21 @@
}
/*
- * Not implemented.
- *
- * @see com.opensymphony.user.provider.CredentialsProvider#changePassword(java.lang.String,
- * java.lang.String)
- */
+ * Not implemented.
+ *
+ * @see com.opensymphony.user.provider.CredentialsProvider#changePassword(java.lang.String,
+ * java.lang.String)
+ */
public boolean changePassword(String arg0, String arg1)
{
throw new RuntimeException("Not implemented");
}
/*
- * Not implemented.
- *
- * @see com.opensymphony.user.provider.UserProvider#create(java.lang.String)
- */
+ * Not implemented.
+ *
+ * @see com.opensymphony.user.provider.UserProvider#create(java.lang.String)
+ */
public boolean create(String name)
{
@@ -92,20 +95,20 @@
}
/*
- * Does nothing.
- *
- * @see com.opensymphony.user.provider.UserProvider#flushCaches()
- */
+ * Does nothing.
+ *
+ * @see com.opensymphony.user.provider.UserProvider#flushCaches()
+ */
public void flushCaches()
{
}
/*
- * Returns whether a user exists or not.
- *
- * @see com.opensymphony.user.provider.UserProvider#handles(java.lang.String)
- */
+ * Returns whether a user exists or not.
+ *
+ * @see com.opensymphony.user.provider.UserProvider#handles(java.lang.String)
+ */
public boolean handles(String name)
{
try
@@ -124,31 +127,31 @@
}
/*
- * Not implemented.
- *
- * @see com.opensymphony.user.provider.UserProvider#list()
- */
+ * Not implemented.
+ *
+ * @see com.opensymphony.user.provider.UserProvider#list()
+ */
public List list()
{
return null;
}
/*
- * Not implemented.
- *
- * @see com.opensymphony.user.provider.UserProvider#remove(java.lang.String)
- */
+ * Not implemented.
+ *
+ * @see com.opensymphony.user.provider.UserProvider#remove(java.lang.String)
+ */
public boolean remove(String arg0)
{
throw new RuntimeException("Not implemented");
}
/*
- * Not implemented.
- *
- * @see com.opensymphony.user.provider.UserProvider#store(java.lang.String,
- * com.opensymphony.user.Entity.Accessor)
- */
+ * Not implemented.
+ *
+ * @see com.opensymphony.user.provider.UserProvider#store(java.lang.String,
+ * com.opensymphony.user.Entity.Accessor)
+ */
public boolean store(String arg0, Accessor arg1)
{
throw new RuntimeException("Not implemented");
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/DynamicMemoryComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/DynamicMemoryComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/DynamicMemoryComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/DynamicMemoryComponentConfig.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.
+-->
<my-system>
<fulcrumProvider/>
<securityService/>
@@ -6,14 +25,14 @@
<aclFactory/>
<userManager>
<className>org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicUserImpl</className>
- </userManager>
+ </userManager>
<groupManager>
<className>org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicGroupImpl</className>
- </groupManager>
+ </groupManager>
<roleManager>
<className>org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicRoleImpl</className>
- </roleManager>
+ </roleManager>
<permissionManager>
<className>org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicPermissionImpl</className>
- </permissionManager>
-</my-system>
\ No newline at end of file
+ </permissionManager>
+</my-system>
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/DynamicMemoryRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/DynamicMemoryRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/DynamicMemoryRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/DynamicMemoryRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,10 +1,29 @@
+<?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="com.opensymphony.user.provider.UserProvider"
shorthand="fulcrumProvider"
default-class="org.apache.fulcrum.security.adapter.osuser.FulcrumAccessProvider"/>
-
+
<role
name="org.apache.fulcrum.security.SecurityService"
shorthand="securityService"
@@ -29,14 +48,14 @@
<role
name="org.apache.fulcrum.security.ModelManager"
shorthand="modelManager"
- default-class="org.apache.fulcrum.security.memory.dynamic.MemoryModelManagerImpl"/>
+ default-class="org.apache.fulcrum.security.memory.dynamic.MemoryModelManagerImpl"/>
<role
name="org.apache.fulcrum.security.authenticator.Authenticator"
shorthand="authenticator"
- default-class="org.apache.fulcrum.security.authenticator.TextMatchAuthenticator"/>
+ default-class="org.apache.fulcrum.security.authenticator.TextMatchAuthenticator"/>
<role
name="org.apache.fulcrum.security.model.ACLFactory"
shorthand="aclFactory"
- default-class="org.apache.fulcrum.security.model.dynamic.DynamicACLFactory"/>
+ default-class="org.apache.fulcrum.security.model.dynamic.DynamicACLFactory"/>
</role-list>
-
\ No newline at end of file
+
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/Log4j.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/Log4j.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/Log4j.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/Log4j.properties Fri May 4 23:58:06 2007
@@ -1,3 +1,19 @@
+# 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.
# ------------------------------------------------------------------------
#
# Logging Configuration
@@ -24,11 +40,11 @@
log4j.category.avalon = INFO, avalon
log4j.additivity.avalon = false
-########################################################################
+# #######################################################################
#
# Logfile definitions
#
-########################################################################
+# #######################################################################
#
# turbine.log
@@ -41,7 +57,7 @@
#
# torque.log
-#
+#
log4j.appender.torque = org.apache.log4j.FileAppender
log4j.appender.torque.file = target/torque.log
log4j.appender.torque.layout = org.apache.log4j.PatternLayout
@@ -60,31 +76,31 @@
# BEGIN HIBERNATE SECTION
-### direct log messages to stdout ###
+# ## direct log messages to stdout ###
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-### direct messages to file hibernate.log ###
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+# ## direct messages to file hibernate.log ###
+# log4j.appender.file=org.apache.log4j.FileAppender
+# log4j.appender.file.File=hibernate.log
+# log4j.appender.file.layout=org.apache.log4j.PatternLayout
+# log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-### set log levels - for more verbose logging change 'info' to 'debug' ##
+# ## set log levels - for more verbose logging change 'info' to 'debug' ##
log4j.rootLogger=warn, stdout
log4j.logger.net.sf.hibernate=warn
-### enable the following line if you want to track down connection ###
-### leakages when using DriverManagerConnectionProvider ###
-#log4j.logger.net.sf.hibernate.connection.DriverManagerConnectionProvider=trace
+# ## enable the following line if you want to track down connection ###
+# ## leakages when using DriverManagerConnectionProvider ###
+# log4j.logger.net.sf.hibernate.connection.DriverManagerConnectionProvider=trace
-### log JDBC bind parameters ###
+# ## log JDBC bind parameters ###
log4j.logger.net.sf.hibernate.type=info
-### log prepared statement cache activity ###
+# ## log prepared statement cache activity ###
log4j.logger.net.sf.hibernate.ps.PreparedStatementCache=info
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/org/apache/fulcrum/security/adapter/osuser/OSUserAdapterTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/org/apache/fulcrum/security/adapter/osuser/OSUserAdapterTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/org/apache/fulcrum/security/adapter/osuser/OSUserAdapterTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/org/apache/fulcrum/security/adapter/osuser/OSUserAdapterTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.osuser;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.Collection;
@@ -34,7 +37,7 @@
/**
* Test that we can load up OSUser backed by Fulcrum Security. The fulcrum Security service is just
* running in memory.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -126,7 +129,7 @@
accessProvider.inGroup("Jeannie", "role1"));
System.out.println("hi");
-
+
assertEquals(
"Neither should have role3",
acl.hasRole("role3"),
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/osuser.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/osuser.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/osuser.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/src/test/osuser.xml Fri May 4 23:58:06 2007
@@ -1,14 +1,33 @@
+<?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.
+-->
<opensymphony-user>
<!--
Authenticators can take properties just like providers.
This smart authenticator should work for 'most' cases - it dynamically looks up
the most appropriate authenticator for the current server.
- -->
+ -->
<authenticator class="com.opensymphony.user.authenticator.SmartAuthenticator" />
<!-- Fulcrum providers -->
- <provider class="org.apache.fulcrum.security.adapter.osuser.FulcrumAccessProvider"/>
+ <provider class="org.apache.fulcrum.security.adapter.osuser.FulcrumAccessProvider"/>
<provider class="org.apache.fulcrum.security.adapter.osuser.FulcrumCredentialsProvider"/>
<!-- don't have a propertyset provider, so just return a memory one. -->
<provider class="com.opensymphony.user.provider.memory.MemoryProfileProvider" />
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/opensymphony/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.
+-->
<!DOCTYPE project [
<!ENTITY security-nav SYSTEM "../../../incl_nav.xml">
@@ -7,9 +25,9 @@
name="Secuirty"
href="http://jakarta.apache.org/turbine/fulcrum/sites/security.html/">
-
+
&security-nav;
</project>
-
\ No newline at end of file
+
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/maven.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.properties Fri May 4 23:58:06 2007
@@ -1,3 +1,19 @@
+# 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.
maven.multiproject.type=jar
maven.junit.usefile=true
maven.junit.fork=true
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/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-security-adapter-turbine</id>
@@ -6,45 +24,45 @@
<dependencies>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
<version>1.0.7</version>
</dependency>
-
+
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-crypto</artifactId>
<version>1.0.5</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>cryptix</groupId>
<artifactId>cryptix</artifactId>
<version>3.2.0</version>
<url>http://www.cryptix.org/</url>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.2</version>
- </dependency>
+ </dependency>
+
+
-
-
<!-- Needed only for the Turbine Adapter -->
<dependency>
<groupId>turbine</groupId>
<artifactId>turbine</artifactId>
<version>2.3.2</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>xstream</groupId>
@@ -58,21 +76,21 @@
<artifactId>servletapi</artifactId>
<version>2.3</version>
<url>http://java.sun.com/products/servlet/</url>
- </dependency>
+ </dependency>
<dependency>
<groupId>torque</groupId>
<artifactId>torque</artifactId>
<version>3.2</version>
<url>http://db.apache.org/torque/</url>
- </dependency>
+ </dependency>
<!-- testing -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-security-memory</artifactId>
<version>1.0.7</version>
- </dependency>
+ </dependency>
<!-- Needed only for testing the Turbine Adaptor -->
@@ -80,34 +98,34 @@
<groupId>mockobjects</groupId>
<artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
<version>0.09</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
<version>0.09</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
</dependency>
-
+
<dependency>
<groupId>ecs</groupId>
<artifactId>ecs</artifactId>
<version>1.4.2</version>
<url>http://jakarta.apache.org/ecs/</url>
</dependency>
-
+
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>2.0.2</version>
<url>http://xml.apache.org/commons/</url>
- </dependency>
-
+ </dependency>
+
<!-- ECM dependencies -->
<dependency>
<groupId>excalibur-component</groupId>
@@ -115,50 +133,50 @@
<version>2.1</version>
<url>http://excalibur.apache.org/</url>
</dependency>
-
+
<dependency>
<groupId>excalibur-instrument</groupId>
<artifactId>excalibur-instrument-api</artifactId>
<version>2.1</version>
<url>http://excalibur.apache.org/</url>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>excalibur-logger</groupId>
<artifactId>excalibur-logger</artifactId>
<version>2.1</version>
<url>http://excalibur.apache.org/</url>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
<url>http://jakarta.apache.org/commons/collections.html</url>
</dependency>
-
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<url>http://jakarta.apache.org/log4j/</url>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>excalibur-pool</groupId>
<artifactId>excalibur-pool-api</artifactId>
<version>2.1</version>
<url>http://excalibur.apache.org/</url>
</dependency>
-
+
<dependency>
<groupId>avalon-logkit</groupId>
<artifactId>avalon-logkit</artifactId>
<version>2.1</version>
<url>http://excalibur.apache.org</url>
- </dependency>
-
+ </dependency>
+
</dependencies>
-
+
</project>
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdapter.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdapter.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdapter.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdapter.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.Iterator;
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/BaseAdapter.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/BaseAdapter.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/BaseAdapter.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/BaseAdapter.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.commons.beanutils.Converter;
@@ -48,7 +51,7 @@
{
return getIdAsObj().intValue();
}
- /*
+ /*
* @see org.apache.turbine.om.security.SecurityEntity#getIdAsObj()
*/
public Integer getIdAsObj()
@@ -91,8 +94,8 @@
{
throw new RuntimeException("Unsupported operation");
}
-
+
public SecurityEntity getSecurityEntity(){
- return entity;
+ return entity;
}
}
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/GroupAdapter.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/GroupAdapter.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/GroupAdapter.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/GroupAdapter.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * 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.security.entity.SecurityEntity;
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/InterfaceDelegator.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/InterfaceDelegator.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/InterfaceDelegator.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/InterfaceDelegator.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * 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.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org