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 [35/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/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java Fri May 4 23:58:06 2007
@@ -1,115 +1,118 @@
-package org.apache.fulcrum.security.torque.dynamic;
-
-/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.fulcrum.security.SecurityService;
-import org.apache.fulcrum.security.model.dynamic.test.AbstractDynamicModelManagerTest;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupPeer;
-import org.apache.fulcrum.security.torque.HsqlDB;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicPermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegatesPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorqueDynamicUserPeer;
-import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
-
-/**
- * @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
- * @author <a href="jh@byteaction.de">Jürgen Hoffmann</a>
- * @version $Id:$
- */
-public class TorqueDynamicModelManagerTest extends AbstractDynamicModelManagerTest
-{
- protected static HsqlDB hsqlDB = null;
-
- public void setUp()
- {
- try
- {
- hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-dynamic-schema.sql");
- hsqlDB.addSQL("src/test/id-table-schema.sql");
- hsqlDB.addSQL("src/test/fulcrum-dynamic-schema-idtable-init.sql");
-
- this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
- this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
- securityService = (SecurityService) lookup(SecurityService.ROLE);
- super.setUp();
- }
- catch (Exception e)
- {
- fail(e.toString());
- }
- }
-
- public void tearDown()
- {
- // cleanup tables
- try
- {
- Criteria criteria = new Criteria();
- criteria.add(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TorqueDynamicUserGroupPeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TorqueDynamicGroupRolePeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TorqueDynamicRolePermissionPeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN);
- TorqueDynamicUserDelegatesPeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueDynamicUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TorqueDynamicUserPeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueDynamicGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TorqueDynamicGroupPeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueDynamicRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TorqueDynamicRolePeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueDynamicPermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
- TorqueDynamicPermissionPeer.doDelete(criteria);
- }
- catch (TorqueException e)
- {
- fail(e.toString());
- }
-
- securityService = null;
- }
-
- /**
- * Constructor for TorqueDynamicModelManagerTest.
- *
- * @param arg0
- */
- public TorqueDynamicModelManagerTest(String arg0)
- {
- super(arg0);
- }
-}
+package org.apache.fulcrum.security.torque.dynamic;
+
+/*
+ * 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 org.apache.fulcrum.security.SecurityService;
+import org.apache.fulcrum.security.model.dynamic.test.AbstractDynamicModelManagerTest;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupPeer;
+import org.apache.fulcrum.security.torque.HsqlDB;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicPermissionPeer;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePeer;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegatesPeer;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicUserGroupPeer;
+import org.apache.fulcrum.security.torque.om.TorqueDynamicUserPeer;
+import org.apache.torque.TorqueException;
+import org.apache.torque.util.Criteria;
+
+/**
+ * @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
+ * @author <a href="jh@byteaction.de">Jürgen Hoffmann</a>
+ * @version $Id:$
+ */
+public class TorqueDynamicModelManagerTest extends AbstractDynamicModelManagerTest
+{
+ protected static HsqlDB hsqlDB = null;
+
+ public void setUp()
+ {
+ try
+ {
+ hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-dynamic-schema.sql");
+ hsqlDB.addSQL("src/test/id-table-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-dynamic-schema-idtable-init.sql");
+
+ this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
+ this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
+ super.setUp();
+ }
+ catch (Exception e)
+ {
+ fail(e.toString());
+ }
+ }
+
+ public void tearDown()
+ {
+ // cleanup tables
+ try
+ {
+ Criteria criteria = new Criteria();
+ criteria.add(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicUserGroupPeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicGroupRolePeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicRolePermissionPeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicUserDelegatesPeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueDynamicUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicUserPeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueDynamicGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicGroupPeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueDynamicRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicRolePeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueDynamicPermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
+ TorqueDynamicPermissionPeer.doDelete(criteria);
+ }
+ catch (TorqueException e)
+ {
+ fail(e.toString());
+ }
+
+ securityService = null;
+ }
+
+ /**
+ * Constructor for TorqueDynamicModelManagerTest.
+ *
+ * @param arg0
+ */
+ public TorqueDynamicModelManagerTest(String arg0)
+ {
+ super(arg0);
+ }
+}
Modified: jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java Fri May 4 23:58:06 2007
@@ -1,107 +1,110 @@
-package org.apache.fulcrum.security.torque.turbine;
-/*
- * Copyright 2001-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.fulcrum.security.SecurityService;
-import org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineGroupPeer;
-import org.apache.fulcrum.security.torque.om.TorqueTurbinePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePeer;
-import org.apache.fulcrum.security.torque.HsqlDB;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
-import org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer;
-import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
-
-/**
- * @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
- * @author <a href="jh@byteaction.de">Jürgen Hoffmann</a>
- * @version $Id:$
- */
-public class TorqueTurbineModelManagerTest
- extends AbstractTurbineModelManagerTest
-{
- protected static HsqlDB hsqlDB = null;
-
- public void setUp() throws Exception
- {
-
- try
- {
- hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-turbine-schema.sql");
- hsqlDB.addSQL("src/test/id-table-schema.sql");
- hsqlDB.addSQL("src/test/fulcrum-turbine-schema-idtable-init.sql");
-
- this.setRoleFileName("src/test/TurbineTorqueRoleConfig.xml");
- this.setConfigurationFileName("src/test/TurbineTorqueComponentConfig.xml");
- securityService = (SecurityService) lookup(SecurityService.ROLE);
- super.setUp();
- }
- catch (Exception e)
- {
- fail(e.toString());
- }
-
- }
-
- public void tearDown()
- {
- // cleanup tables
- try
- {
- Criteria criteria = new Criteria();
- criteria.add(TorqueTurbineUserGroupRolePeer.USER_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineUserGroupRolePeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueTurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineRolePermissionPeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueTurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineUserPeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueTurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineGroupPeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueTurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbineRolePeer.doDelete(criteria);
-
- criteria.clear();
- criteria.add(TorqueTurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
- TorqueTurbinePermissionPeer.doDelete(criteria);
- }
- catch (TorqueException e)
- {
- fail(e.toString());
- }
-
- modelManager = null;
- securityService = null;
- }
-
- /**
- * Constructor for TorqueTurbineModelManagerTest.
- * @param arg0
- */
- public TorqueTurbineModelManagerTest(String arg0)
- {
- super(arg0);
- }
-}
+package org.apache.fulcrum.security.torque.turbine;
+/*
+ * 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 org.apache.fulcrum.security.SecurityService;
+import org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest;
+import org.apache.fulcrum.security.torque.om.TorqueTurbineGroupPeer;
+import org.apache.fulcrum.security.torque.om.TorqueTurbinePermissionPeer;
+import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePeer;
+import org.apache.fulcrum.security.torque.HsqlDB;
+import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer;
+import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
+import org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer;
+import org.apache.torque.TorqueException;
+import org.apache.torque.util.Criteria;
+
+/**
+ * @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
+ * @author <a href="jh@byteaction.de">Jürgen Hoffmann</a>
+ * @version $Id:$
+ */
+public class TorqueTurbineModelManagerTest
+ extends AbstractTurbineModelManagerTest
+{
+ protected static HsqlDB hsqlDB = null;
+
+ public void setUp() throws Exception
+ {
+
+ try
+ {
+ hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-turbine-schema.sql");
+ hsqlDB.addSQL("src/test/id-table-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-turbine-schema-idtable-init.sql");
+
+ this.setRoleFileName("src/test/TurbineTorqueRoleConfig.xml");
+ this.setConfigurationFileName("src/test/TurbineTorqueComponentConfig.xml");
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
+ super.setUp();
+ }
+ catch (Exception e)
+ {
+ fail(e.toString());
+ }
+
+ }
+
+ public void tearDown()
+ {
+ // cleanup tables
+ try
+ {
+ Criteria criteria = new Criteria();
+ criteria.add(TorqueTurbineUserGroupRolePeer.USER_ID, 0, Criteria.GREATER_THAN);
+ TorqueTurbineUserGroupRolePeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueTurbineRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
+ TorqueTurbineRolePermissionPeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueTurbineUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
+ TorqueTurbineUserPeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueTurbineGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
+ TorqueTurbineGroupPeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueTurbineRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
+ TorqueTurbineRolePeer.doDelete(criteria);
+
+ criteria.clear();
+ criteria.add(TorqueTurbinePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
+ TorqueTurbinePermissionPeer.doDelete(criteria);
+ }
+ catch (TorqueException e)
+ {
+ fail(e.toString());
+ }
+
+ modelManager = null;
+ securityService = null;
+ }
+
+ /**
+ * Constructor for TorqueTurbineModelManagerTest.
+ * @param arg0
+ */
+ public TorqueTurbineModelManagerTest(String arg0)
+ {
+ super(arg0);
+ }
+}
Modified: jakarta/turbine/fulcrum/trunk/security/torque/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/xdocs/navigation.xml Fri May 4 23:58:06 2007
@@ -1,15 +1,33 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE project [
-<!ENTITY security-nav SYSTEM "../../incl_nav.xml">
-]>
-<project
- name="Security"
- href="http://jakarta.apache.org/turbine/fulcrum/sites/security.html/">
-
-
-
-&security-nav;
-
-</project>
-
\ No newline at end of file
+<?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">
+]>
+<project
+ name="Security"
+ href="http://jakarta.apache.org/turbine/fulcrum/sites/security.html/">
+
+
+
+&security-nav;
+
+</project>
+
Modified: jakarta/turbine/fulcrum/trunk/security/xdocs/authenticators.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/xdocs/authenticators.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/xdocs/authenticators.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/xdocs/authenticators.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>
@@ -21,17 +39,17 @@
<p>
Always returns true, regardless of what is passed in.
</p>
- </subsection>
+ </subsection>
<subsection name="TextMatchAuthenticator">
<p>
Does a plain text match of the passwords. Case does matter.
</p>
- </subsection>
+ </subsection>
<subsection name="NTAuthenticator">
<p>
- Attempts to authenticate the user against an NT domain. The
+ Attempts to authenticate the user against an NT domain. The
username must look like CVILLE\epugh. You will need to configure your
- system to use the tagish library.
+ system to use the tagish library.
</p>
<p>
http://www.mooreds.com/jaas.html
@@ -41,7 +59,7 @@
http://www.raibledesigns.com/page/rd/20030217
<br/>
This application uses a small DLL to provide security. Put the NTSecurity.dll in your JAVA_HOME/jre/bin directory.
- This provides the JNI interface to NT used by JAAS.
+ This provides the JNI interface to NT used by JAAS.
<br/>
Then put the tagish.login fil in the ${java.home}/jre/lib/security/ directory. This tells the Tagish
code what classes to load for security.
@@ -51,14 +69,14 @@
login.config.url.1=file:${java.home}/lib/security/tagish.login
</source>
This tells the java security policy how to find the tagish information.
-
+
</p>
<p>
<!--The last thing is to put the file jaas.jar in your tomcat server/lib/ directory so the JAAS realm can function.-->
</p>
-
- </subsection>
-
+
+ </subsection>
+
<subsection name="CryptoAuthenticator">
<p>
Uses the fulcrum crypto service to check the password
@@ -72,25 +90,25 @@
<![CDATA[
<component
role="org.apache.fulcrum.security.authenticator.Authenticator"
- class="org.apache.fulcrum.security.authenticator.CryptoAuthenticator">
+ class="org.apache.fulcrum.security.authenticator.CryptoAuthenticator">
<algorithm>java</algorithm>
<cipher>SHA1</cipher>
- </component>
-
+ </component>
+
<component
role="org.apache.fulcrum.crypto.CryptoService"
- class="org.apache.fulcrum.crypto.DefaultCryptoService">
+ class="org.apache.fulcrum.crypto.DefaultCryptoService">
<algorithm>
<unix>org.apache.fulcrum.crypto.provider.UnixCrypt</unix>
<clear>org.apache.fulcrum.crypto.provider.ClearCrypt</clear>
- <java>org.apache.fulcrum.crypto.provider.JavaCrypt</java>
- <oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
- </algorithm>
+ <java>org.apache.fulcrum.crypto.provider.JavaCrypt</java>
+ <oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
+ </algorithm>
</component>
]]>
-</source>
- </subsection>
-
+</source>
+ </subsection>
+
</section>
Modified: jakarta/turbine/fulcrum/trunk/security/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/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>Changes</title>
@@ -8,72 +26,72 @@
<body>
<release version="1.0.8" date="">
<action dev="tv" type="update" fixes="TRB-40">
- Changed BasicUser, BasicGroup, DynamicUser, DynamicGroup, DynamicRole,
+ Changed BasicUser, BasicGroup, DynamicUser, DynamicGroup, DynamicRole,
DynamicPermission, TurbineUser, TurbineGroup, TurbineRole and TurbinePermission to
interfaces. Added default implementations for existing security services.
- Changed all occurences of these classes to use BasicUserImpl, BasicGroupImpl,
- DynamicUserImpl, DynamicGroupImpl, DynamicRoleImpl, DynamicPermissionImpl,
+ Changed all occurences of these classes to use BasicUserImpl, BasicGroupImpl,
+ DynamicUserImpl, DynamicGroupImpl, DynamicRoleImpl, DynamicPermissionImpl,
TurbineUserImpl, TurbineGroupImpl, TurbineRoleImpl and TurbinePermissionImpl instead.
- </action>
+ </action>
<action dev="tv" type="add">
Implemented a security service based on Torque.
- </action>
+ </action>
<action dev="tv" type="fix">
Fixed hash code generation and equals() for security entities.
- </action>
+ </action>
<action dev="epugh" type="add" due-to="Kostyantyn Shchekotykhin">
Updated nt impl, turbine and opensymphony adapters to use released versions
of memory impl.
- </action>
- </release>
+ </action>
+ </release>
<release version="1.0.7" date="2004-11-24">
<action dev="epugh" type="add" due-to="Ben Gidley">
Add test to verify that usernames bob and BOB are treated the same.
- </action>
+ </action>
<action dev="epugh" type="add">
Properly flesh out Turbine model of security.
- </action>
+ </action>
</release>
<release version="1.0.6" date="in cvs">
<action dev="epugh" type="add" due-to="Ben Gidley">
Add to the dynamic model the ability to add delegators for users. A user can have
0..n delegatees who can assume the roles and permissions of the user.
Also cleanup of docs.
- </action>
+ </action>
<action dev="epugh" type="add" due-to="Peter Courcoux">
Make serviceManager in AbstractManager class protected to facilitate extension.
- </action>
+ </action>
<action dev="epugh" type="add">
Expose revokeAll(Group group) to the DynamicModelManager API. Was already implemented in the Hibernate
UserManager.
- </action>
+ </action>
<action dev="epugh" type="add" due-to="Michael Jones">
Expose getUserById() to the UserManager API. Was already implemented in the Hibernate
UserManager.
- </action>
+ </action>
<action dev="epugh" type="add" due-to="Michael Jones">
In the Dynamic model, allow permissions to know about the sets they are in. Allows revokeAll(permission)
to be called.
- </action>
+ </action>
<action dev="epugh" type="add" due-to="Michael Jones">
When adding objects to SecuritySet, delegate the add to the implement RoleSet/PermissionSet etc.
- </action>
+ </action>
<action dev="epugh" type="add">
Merge the fulcrum-security-spi classes into fulcurm-security-api. The split
made it too complex to handle unit testing.
- </action>
+ </action>
<action dev="mmanner" type="add">
Null passwords properly dealt with in TextMatchAuthenticator.
- </action>
+ </action>
<action dev="mmanner" type="add">
- Change Basic* entity objects to use Set.
- </action>
+ Change Basic* entity objects to use Set.
+ </action>
<action dev="mmanner" type="add">
- Change Dynamic* entity objects to use Set. Refactored Hibernate implementation of Security to
+ Change Dynamic* entity objects to use Set. Refactored Hibernate implementation of Security to
use more efficient deletion when doing oneshot deletes during revokeAll methods. Added get[Entity]ById()
method as well. Change grants/revokes to be Synchronizied.
</action>
- </release>
+ </release>
<release version="1.0-alpha-6" date="in cvs">
<action dev="epugh" type="add">
Added getAllUsers() to UserManager
@@ -82,42 +100,42 @@
<release version="1.0-alpha-4" date="in cvs">
<action dev="epugh" type="add">
Added ThreadSafe marker interface to AbstractManager.
- </action>
+ </action>
<action dev="epugh" type="add">
Added the "Basic" model and supplied implementations for memory, NT, and Hibernate.
- </action>
+ </action>
<action dev="epugh" type="add">
Added the "Basic" model and supplied implementations for memory, NT, and Hibernate.
- </action>
+ </action>
<action dev="epugh" type="add">
AccessControlLists are now pluggable via the ACLFactory implementation you supply.
- </action>
+ </action>
<action dev="epugh" type="update">
Vastly refactored the builds into multiple projects. The api related onces are <code>/api</code> and <code>/spi</code>.
The implementation details are in <code>/memory</code>,<code>/hibernate</code>, and<code>/nt</code>. And lastly, there
are two adapters: <code>/adapters/turbine</code> and <code>/adapters/opensymphony</code>.
- </action>
+ </action>
<action dev="epugh" type="remove">
Tossed the various Torque code. It isn't unit tested, and was causing lots of work that couldn't be tested.. At some
point, if there is demand, we can put it back.
- </action>
- </release>
+ </action>
+ </release>
<release version="1.0-alpha-3" date="n/a">
<action dev="epugh" type="add">
Realized the one size fits all ACL doesn't work.. ACL's are tied to models. Now, there is
an AccessControlList interface, but it is just a marker. Each model implements the ACL.
Added a Memory implementaiton of the Turbine model.
- </action>
+ </action>
<action dev="epugh" type="fix">
All the various SecuritySet implementations base their logic off their Name, not the ID, or
Object type. Fixes problems with comparisons when you have various subclasses.
- </action>
+ </action>
<action dev="epugh" type="fix">
For a SecurityEntityImpl, if the name is null then throw an InvalidParameterException.
- </action>
+ </action>
<action dev="epugh" type="add">
- Add ModelManager interface and SimpleModelManager and TurbineModelManager
- component that explicitly contains the relationship between the various
+ Add ModelManager interface and SimpleModelManager and TurbineModelManager
+ component that explicitly contains the relationship between the various
entities.
</action>
</release>
@@ -125,7 +143,7 @@
<action dev="epugh" type="update">
Change all get(Role/Group/User/Permssion)Instance from throwing an UnknownEntityException to
throwing a DataBackendException. There is no entity id when creating a new one yet!
- </action>
+ </action>
<action dev="epugh" type="add">
Added an adapter to OSUser. This allows OSUser to query Fulcrum Security
for users and to authenticate them via Fulcrum Security authenticators.
@@ -135,17 +153,17 @@
<action dev="epugh" type="add">
Added an IntegerConverter so the adapter can be used with fulcrum SPI's
that use Long/Integer/String (as a number) as the ID.
- </action>
+ </action>
<action dev="epugh" type="add">
Converted id to Object. Now the various SPI's cast the Object type
to whatever they want to use.
- </action>
+ </action>
<action dev="epugh" type="add">
Pluggable Authenticators done. Added NT, crypto, and plain text.
- </action>
+ </action>
<action dev="epugh" type="add">
Hibernate based Simple model done.
- </action>
+ </action>
<action dev="epugh" type="update">
Converted all id's for security objects to "long" values to prevent running out of numbers.
</action>
Modified: jakarta/turbine/fulcrum/trunk/security/xdocs/example.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/xdocs/example.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/xdocs/example.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/xdocs/example.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>
Modified: jakarta/turbine/fulcrum/trunk/security/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/xdocs/index.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
@@ -12,7 +30,7 @@
<section name="Overview">
<p>
This component provides a highly flexible security framework It is based on code from the
- Turbine framework, but has been expanded and can be used in any container compatible
+ Turbine framework, but has been expanded and can be used in any container compatible
with the Avalon framework.
<ul>
<li>Allow pluggability via Avalon components of various entities.</li>
@@ -21,8 +39,8 @@
<li>Solve most common problems in dealing with security</li>
<li>Not enforce assumptions about how a security framework should be setup.</li>
</ul>
- </p>
- <subsection name="Matrix">
+ </p>
+ <subsection name="Matrix">
<table>
<tr>
<th/><th colspan="2">Basic Model</th><th colspan="5">Dynamic Model</th><th colspan="5">Turbine Model</th>
@@ -37,19 +55,19 @@
</table>
</subsection>
</section>
-
+
<section name="Common Security Implementations">
<p>
- The two most common models for security are embodied in the "Basic" and "Dynamic" models. A third model, "Turbine",
+ The two most common models for security are embodied in the "Basic" and "Dynamic" models. A third model, "Turbine",
demonstrates customizing the "Dynamic" model by adding a concept of a global group.
- </p>
+ </p>
<subsection name="Dynamic">
<p>
For lack of a better name, this one is called Dynamic because you can configure all the relationships.
- In it, you have a set of permissions that are related in a many to many relation ship with a set or roles.
+ In it, you have a set of permissions that are related in a many to many relation ship with a set or roles.
Those roles are related
in a many to many relationship with a set of groups. A user is in a many to many relationship
- with a set of groups. <i>note: I will try and get a diagram. any suggestions on diagram tools?</i>
+ with a set of groups. <i>note: I will try and get a diagram. any suggestions on diagram tools?</i>
</p>
<p>
The <code>memory</code>, <code>hibernate</code> and <code>torque</code> packages currently implements this security model.
@@ -61,7 +79,7 @@
This model is based on what the Turbine application server uses, and leverages the Dynamic model. It merely adds
the concept of a "global group" which is a toplevel group to the Dynamic model.
However, what makes this different is that instead of roles
- being related just to groups, there instead is a many to many relationship between users and
+ being related just to groups, there instead is a many to many relationship between users and
groups and roles. So you pick a user, pick their role, and their group, and that is their permissions.
</p>
</subsection>
@@ -69,14 +87,14 @@
<p>
This model is very simple and was originally inspired by OSUser's security model. In it, you have users, and groups, and security
is based on a user belonging to a group. Users can belong to multiple groups. So groups become
- the equivalent of roles/permissions.
+ the equivalent of roles/permissions.
</p>
<p>
The <code>memory</code>, <code>nt</code> <code>torque</code> and <code>hibernate</code> packages currently implements this security model.
</p>
</subsection>
- </section>
-
+ </section>
+
<section name="Simple">
<subsection name="Usage of InMemory components">
@@ -84,7 +102,7 @@
The InMemory components implement the Basic model. All data is strictly in memory, and is
not persisted. Therefore when your application stops, all values are lost. However, this is
very useful in unit testing and prototyping using the Security component. Notice how role,
- user, group, and permission managers are all Avalon components as well? This allows you to swap one
+ user, group, and permission managers are all Avalon components as well? This allows you to swap one
component out for another. Say you wanted to provide your own group manager that checked that
a group existed in NT. You could swap out the MemoryGroupManager implementation for a NTGroupManager,
assuming you kept the API the same.
@@ -93,7 +111,7 @@
<subsection name="Configuration">
<p>
This uses the integrated role and component config XML. Check the /src/test directory for the most uptodate
- examples of the configuration files used in unit testing!
+ examples of the configuration files used in unit testing!
</p>
<p>
<source>
@@ -101,31 +119,31 @@
<my-system>
<component
role="org.apache.fulcrum.security.SecurityService"
- class="org.apache.fulcrum.security.BaseSecurityService">
- </component>
-
+ class="org.apache.fulcrum.security.BaseSecurityService">
+ </component>
+
<component
role="org.apache.fulcrum.security.UserManager"
- class="org.apache.fulcrum.security.memory.MemoryUserManagerImpl">
- </component>
+ class="org.apache.fulcrum.security.memory.MemoryUserManagerImpl">
+ </component>
<component
role="org.apache.fulcrum.security.GroupManager"
- class="org.apache.fulcrum.security.memory.MemoryGroupManagerImpl">
- </component>
+ class="org.apache.fulcrum.security.memory.MemoryGroupManagerImpl">
+ </component>
<component
role="org.apache.fulcrum.security.RoleManager"
- class="org.apache.fulcrum.security.memory.MemoryRoleManagerImpl">
- </component>
+ class="org.apache.fulcrum.security.memory.MemoryRoleManagerImpl">
+ </component>
<component
role="org.apache.fulcrum.security.PermissionManager"
- class="org.apache.fulcrum.security.memory.MemoryPermissionManagerImpl">
- </component>
+ class="org.apache.fulcrum.security.memory.MemoryPermissionManagerImpl">
+ </component>
<component
role="org.apache.fulcrum.security.ModelManager"
- class="org.apache.fulcrum.security.memory.basic.MemoryModelManagerImpl">
+ class="org.apache.fulcrum.security.memory.basic.MemoryModelManagerImpl">
</component>
</my-system>
]]>
@@ -146,7 +164,7 @@
<subsection name="OSUser">
<p>
- In <code>org.apache.fulcrum.security.adapter.osuser</code> is an implementation of the various *Provider classes
+ In <code>org.apache.fulcrum.security.adapter.osuser</code> is an implementation of the various *Provider classes
required by OSUser. In order to have OSUser load up these classes, you must add this to your <code>ouser.xml</code> configuration
file.
</p>
@@ -154,21 +172,21 @@
<source>
<![CDATA[
<!-- 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" />
]]>
</source>
- </p>
+ </p>
<p>
When using the FulcrumAccessProvider and FulcrumCredentialsProvider, you must first pass into them the
- Fulcrum SecurityService class. They both inherit from BaseFulcrumProvider, so you can just do
+ Fulcrum SecurityService class. They both inherit from BaseFulcrumProvider, so you can just do
<code>BaseFulcrumProvider.setSecurityService(securityService)</code> before OSUser calls them for the
- first time.
+ first time.
</p>
- </subsection>
-</section>
+ </subsection>
+</section>
<section name="Implementation Details">
<subsection name="Hibernate">
@@ -190,18 +208,18 @@
<![CDATA[
<userManager>
<className>org.apache.fulcrum.security.torque.om.TorqueDynamicUser</className>
- </userManager>
+ </userManager>
<groupManager>
<className>org.apache.fulcrum.security.torque.om.TorqueDynamicGroup</className>
- </groupManager>
+ </groupManager>
<roleManager>
<className>org.apache.fulcrum.security.torque.om.TorqueDynamicRole</className>
- </roleManager>
+ </roleManager>
<permissionManager>
<className>org.apache.fulcrum.security.torque.om.TorqueDynamicPermission</className>
- </permissionManager>
+ </permissionManager>
]]>
- </source>
+ </source>
</p>
<p>
As a default, the Torque Security Service uses <code>fulcrum</code> as the name of the connection pool for the tables used. This should be considered
@@ -211,11 +229,11 @@
<subsection name="NT">
<p>
If you use the BasicModel with the NT implementation, you have a wholly NT based authentication scheme! The groups map onto NT groups, while the
- users are authenticated against NT as well. This does require you to ask your users for their NT username and password however, we
+ users are authenticated against NT as well. This does require you to ask your users for their NT username and password however, we
don't have NTLM working as yet.
</p>
- </subsection>
-</section>
+ </subsection>
+</section>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/security/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/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,11 +25,11 @@
name="Secuirty"
href="http://jakarta.apache.org/turbine/fulcrum/sites/security.html/">
-
+
&security-nav;
</project>
-
-
-
+
+
+
Modified: jakarta/turbine/fulcrum/trunk/security/xdocs/tasks.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/xdocs/tasks.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/xdocs/tasks.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/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>
@@ -12,37 +30,37 @@
Lists of todos and ideas for future versions.
</p>
<p>
-
- <ul>
+
+ <ul>
<li>
Need to use the encryption component!
- </li>
+ </li>
<li>
Finish fleshing out the Adapters for Turbine. Right now they are a pretty minimal implementation
to validate that the Adapter concept would work. Currently they only support moving objects from
fulcrum to turbine. Sending objects from Turbine back to Fulcrum is not supported. Just needs some
grunt work.
- </li>
+ </li>
<li>
- Try and figure out how to get both NTLM authentication, as well as retrieving the password, or the groups
+ Try and figure out how to get both NTLM authentication, as well as retrieving the password, or the groups
directly to use with "Basic" security model.
</li>
<li>
Upgrade to using Merlin for unit tests instead of ECM.. Also have demos showing using the security module
in Merlin.
- </li>
+ </li>
</ul>
- </p>
+ </p>
</section>
-
+
<section name="Things to Resolve">
-
-
-
-
-
- </section>
+
+
+
+
+
+ </section>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/template/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/template/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/template/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/template/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-template</id>
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/BaseTemplateEngineService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/BaseTemplateEngineService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/BaseTemplateEngineService.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/BaseTemplateEngineService.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/DefaultTemplateContext.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/DefaultTemplateContext.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/DefaultTemplateContext.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/DefaultTemplateContext.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.template;
/*
- * Copyright 2000-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateContext.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateContext.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateContext.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateContext.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.template;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateEmail.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateEmail.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateEmail.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateEmail.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -28,7 +31,7 @@
/**
* This is a simple class for sending email from within the TemplateService.
- * Essentially, the body of the email is processed with a
+ * Essentially, the body of the email is processed with a
* TemplateContext object.
* The beauty of this is that you can send email from within your
* template layer or from your business logic in your Java code.
@@ -79,7 +82,7 @@
* will be called for you when Velocity tries to convert the
* TemplateEmail to a string by calling toString()).</p>
*
- * <p>If you need your email to be word-wrapped, you can add the
+ * <p>If you need your email to be word-wrapped, you can add the
* following call to those above:
*
* <pre>
@@ -145,7 +148,7 @@
* The charset
*/
private String charset = null;
-
+
/**
* The templateService to use in generating text
*
@@ -173,7 +176,7 @@
* @param email A String.
* @param name A String.
*/
- public void addTo(String email, String name)
+ public void addTo(String email, String name)
throws Exception
{
try
@@ -195,14 +198,14 @@
throw new Exception("Cannot add 'To' recipient: " + e);
}
}
-
+
/**
* Add a recipient CC to the email.
*
* @param email A String.
* @param name A String.
*/
- public void addCc(String email, String name)
+ public void addCc(String email, String name)
throws Exception
{
try
@@ -227,7 +230,7 @@
/**
- * The given Unicode string will be charset-encoded using the specified
+ * The given Unicode string will be charset-encoded using the specified
* charset. The charset is also used to set the "charset" parameter.
*
* @param charset a <code>String</code> value
@@ -291,15 +294,15 @@
* @return An Email.
* @exception MessagingException.
*/
- public TemplateEmail addReplyTo( String name, String email)
+ public TemplateEmail addReplyTo( String name, String email)
{
String[] emailName = new String[2];
emailName[0] = email;
emailName[1] = name;
- if (replyToList == null)
+ if (replyToList == null)
{
replyToList = new ArrayList(3);
- }
+ }
replyToList.add(emailName);
return this;
}
@@ -310,10 +313,10 @@
String[] pair = new String[2];
pair[0] = name;
pair[1] = value;
- if (headersList == null)
+ if (headersList == null)
{
headersList = new ArrayList(3);
- }
+ }
headersList.add(pair);
return this;
}
@@ -368,7 +371,7 @@
}
/**
- * Set the context object that will be merged with the
+ * Set the context object that will be merged with the
* template.
*
* @param context A TemplateContext context object.
@@ -381,7 +384,7 @@
}
/**
- * Get the context object that will be merged with the
+ * Get the context object that will be merged with the
* template.
*
* @return A TemplateContext.
@@ -435,9 +438,9 @@
}
SimpleEmail se = new SimpleEmail();
- if (charset != null)
+ if (charset != null)
{
- se.setCharset(charset);
+ se.setCharset(charset);
}
se.setFrom(fromEmail, fromName);
se.setTo(toList);
@@ -449,20 +452,20 @@
se.setSubject(subject);
se.setMsg(body);
- if (headersList != null)
+ if (headersList != null)
{
Iterator i = headersList.iterator();
- while (i.hasNext())
+ while (i.hasNext())
{
String[] pair = (String[])i.next();
se.addHeader(pair[0], pair[1]);
}
}
-
+
se.send();
}
-
-
+
+
/**
* A javabean style setter for passing in manually a templateservice
@@ -480,10 +483,10 @@
private void addReplyTo(SimpleEmail se)
throws Exception
{
- if (replyToList != null)
+ if (replyToList != null)
{
Iterator i = replyToList.iterator();
- while (i.hasNext())
+ while (i.hasNext())
{
String[] emailName = (String[])i.next();
se.addReplyTo(emailName[0], emailName[1]);
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateEngineService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateEngineService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateEngineService.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateEngineService.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateException.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateException.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateException.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateException.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateHtmlEmail.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateHtmlEmail.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateHtmlEmail.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateHtmlEmail.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -76,12 +79,12 @@
/** The map of embedded files. */
private Hashtable embmap = null;
-
+
/**
* The templateService to use in generating text
*
*/
- private TemplateService templateService;
+ private TemplateService templateService;
/**
* Constructor, sets the TemplateContext object.
@@ -146,12 +149,12 @@
htmlbody = templateService.handleRequest(
context, htmlTemplate);
}
-
+
if(textTemplate != null)
{
textbody = templateService.handleRequest(
context, textTemplate);
- }
+ }
}
catch( Exception e)
{
@@ -218,13 +221,13 @@
String cid = (String)embmap.get(filename);
return "cid:"+cid;
}
-
+
/**
* A javabean style setter for passing in manually a templateservice
* @param templateService The templateService to set.
*/
public void setTemplateService(TemplateService templateService) {
this.templateService = templateService;
- }
+ }
}
-
+
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateService.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TemplateService.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -36,7 +39,7 @@
*/
public interface TemplateService
{
-
+
String ROLE = TemplateService.class.getName();
/**
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TurbineTemplateService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TurbineTemplateService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TurbineTemplateService.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/TurbineTemplateService.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -141,15 +144,15 @@
}
/**
- * Determine if a template exists. Delegates to the appropriate {@link
- * org.apache.fulcrum.template.TemplateEngineService} to check the
+ * Determine if a template exists. Delegates to the appropriate {@link
+ * org.apache.fulcrum.template.TemplateEngineService} to check the
* existance of the specified template. If no template engine service is
* found for the template, false is returned.
- *
+ *
* @param template The template file to check for the existence of.
*
* @return true if there is a template engine service registered for the
- * given template, and it reports that the template exists,
+ * given template, and it reports that the template exists,
* otherwise false.
*/
public boolean templateExists(String template)
@@ -238,30 +241,30 @@
{
return new DefaultTemplateContext();
}
-
+
/**
* @see org.apache.fulcrum.ServiceBroker#getRealPath(String)
*/
public String getRealPath(String path)
{
String absolutePath = null;
- if (applicationRoot == null)
+ if (applicationRoot == null)
{
absolutePath = new File(path).getAbsolutePath();
}
- else
+ else
{
absolutePath = new File(applicationRoot, path).getAbsolutePath();
}
-
+
return absolutePath;
- }
+ }
// ---------------- Avalon Lifecycle Methods ---------------------
public void contextualize(Context context) throws ContextException {
this.applicationRoot = context.get( "urn:avalon:home" ).toString();
- }
-
-
+ }
+
+
}
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/jsp/JspService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/jsp/JspService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/jsp/JspService.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/jsp/JspService.java Fri May 4 23:58:06 2007
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License")
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
@@ -42,17 +45,17 @@
* executes the JSP given by templateName.
*/
/*
- public void handleRequest(RunData data, String templateName, boolean isForward)
- throws ServiceException;
- */
+ * public void handleRequest(RunData data, String templateName, boolean isForward)
+ * throws ServiceException;
+ */
/**
* executes the JSP given by templateName.
*/
/*
- public void handleRequest(RunData data, String templateName)
- throws ServiceException;
- */
+ * public void handleRequest(RunData data, String templateName)
+ * throws ServiceException;
+ */
/**
* The buffer size
@@ -60,7 +63,7 @@
public int getDefaultBufferSize();
/**
- * Searchs for a template in the default.template path[s] and
+ * Searchs for a template in the default.template path[s] and
* returns the template name with a relative path which is required
* by <a href="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/ServletContext.html#getRequestDispatcher(java.lang.String)">javax.servlet.RequestDispatcher</a>
*
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org