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 [26/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/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateBasicModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateBasicModelManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateBasicModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateBasicModelManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.hibernate.basic;
/*
- * 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 net.sf.hibernate.Transaction;
@@ -43,7 +46,7 @@
super.setUp();
}
-
+
public void testRevokeAllUser() throws Exception{
super.testRevokeAllUser();
((HibernateUserManagerImpl)userManager).getPersistenceHelper().retrieveSession().close();
@@ -51,9 +54,9 @@
User user = userManager.getUserInstance("Clint2");
assertEquals(0, ((BasicUser) user).getGroups().size());
tx.commit();
-
+
}
-
+
public void tearDown()
{
try
Modified: jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateGroupManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateGroupManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateGroupManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateGroupManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.hibernate.basic;
/*
- * 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 net.sf.hibernate.avalon.HibernateService;
Modified: jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateUserManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateUserManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateUserManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateUserManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.hibernate.basic;
/*
- * 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 net.sf.hibernate.avalon.HibernateService;
Modified: jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateDynamicModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateDynamicModelManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateDynamicModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateDynamicModelManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.hibernate.dynamic;
/*
- * 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 net.sf.hibernate.avalon.HibernateService;
Modified: jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateExtendedUserGroupManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateExtendedUserGroupManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateExtendedUserGroupManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateExtendedUserGroupManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.hibernate.dynamic;
/*
- * 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 net.sf.hibernate.avalon.HibernateService;
Modified: jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/entity/ExtendedUser.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/entity/ExtendedUser.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/entity/ExtendedUser.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/entity/ExtendedUser.java Fri May 4 23:58:06 2007
@@ -1,26 +1,29 @@
package org.apache.fulcrum.security.hibernate.dynamic.entity;
/*
- * 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.model.dynamic.entity.impl.DynamicUserImpl;
/**
* User to test subclassing an existing class and then persiting with
* Hibernate.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -29,7 +32,7 @@
private String NTDomain;
private String NTName;
private String Email;
-
+
/**
* @return Returns the email.
Modified: jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/turbine/HibernateTurbineModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/turbine/HibernateTurbineModelManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/turbine/HibernateTurbineModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/turbine/HibernateTurbineModelManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.hibernate.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 net.sf.hibernate.avalon.HibernateService;
Modified: jakarta/turbine/fulcrum/trunk/security/hibernate/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/hibernate/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/hibernate/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/hibernate/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/incl_nav.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/incl_nav.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/incl_nav.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/incl_nav.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.
+-->
<body>
<links>
<item name="Turbine"
@@ -11,9 +30,9 @@
<item name="Authenticators" href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-security-site/authenticators.html"/>
<item name="Tasks" href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-security-site/tasks.html"/>
</menu>
-
+
<menu name="Security Components">
- <item name="Site" href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-security-site/index.html"/>
+ <item name="Site" href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-security-site/index.html"/>
<item name="Security API" href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-security-api/index.html"/>
<item name="Memory Impl" href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-security-memory/index.html"/>
<item name="Hibernate Impl" href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-security-hibernate/index.html"/>
@@ -23,4 +42,4 @@
<item name="Adapter OpenSymphony" href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-security-adapter-opensymphony/index.html"/>
</menu>
- </body>
\ No newline at end of file
+ </body>
Modified: jakarta/turbine/fulcrum/trunk/security/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/maven.xml Fri May 4 23:58:06 2007
@@ -1,22 +1,41 @@
-<project default="fulcrum:security-site"
- xmlns:maven="jelly:maven"
- xmlns:ant="jelly:ant"
+<?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="fulcrum:security-site"
+ xmlns:maven="jelly:maven"
+ xmlns:ant="jelly:ant"
>
<preGoal name="site">
<ant:copy file="${basedir}/incl_nav.xml" todir="target" failonerror="false"/>
</preGoal>
-
+
<!-- Added to top level build gets subprojects -->
<preGoal name="jar:install">
-
+
</preGoal>
-
+
<!-- Added to top level build gets subprojects -->
<preGoal name="clean:clean">
-
+
</preGoal>
-
+
<goal name="fulcrum:security-jar-install" description="Build and install all Fulcrum Security components">
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
@@ -29,7 +48,7 @@
<goal name="fulcrum:security-site" description="Build Security website">
<attainGoal name="multiproject:site"/>
</goal>
-
+
<goal name="fulcrum:security-clean" description="Clean all Fulcrum Security components" prereqs="clean">
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
@@ -37,6 +56,6 @@
goals="clean:clean"
banner="Installing:"
ignoreFailures="true" />
- </goal>
+ </goal>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/security/memory/conf/block.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/conf/block.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/conf/block.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/conf/block.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.
+-->
<container name="test">
<classloader>
@@ -11,7 +30,7 @@
<component name="crypto" class="org.apache.fulcrum.crypto.DefaultCryptoService"/>
-<!--
+<!--
<component name="authenticator" class="org.apache.fulcrum.security.authenticator.CryptoAuthenticator"/>
- -->
+-->
</container>
Modified: jakarta/turbine/fulcrum/trunk/security/memory/conf/config.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/conf/config.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/conf/config.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/conf/config.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.
+-->
<targets>
Modified: jakarta/turbine/fulcrum/trunk/security/memory/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/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/memory/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/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/memory/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/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-memory</id>
@@ -6,23 +24,23 @@
<dependencies>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
<version>1.0.8-dev</version>
- </dependency>
-
+ </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>
</dependencies>
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.memory;
/*
- * 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;
import java.util.List;
@@ -117,7 +120,7 @@
throw new DataBackendException("renameGroup(Group,String)", e);
}
}
-
+
/**
* Determines if the <code>Group</code> exists in the security system.
*
@@ -128,9 +131,9 @@
* @throws Exception A generic exception.
*/
public boolean checkExists(String groupName) throws DataBackendException
- {
- return MemoryHelper.checkExists(groups,groupName);
- }
+ {
+ return MemoryHelper.checkExists(groups,groupName);
+ }
/**
* Creates a new group with specified attributes.
*
@@ -143,12 +146,12 @@
public synchronized Group persistNewGroup(Group group)
throws DataBackendException
{
-
+
group.setId(MemoryHelper.getUniqueId());
groups.add(group);
// return the object with correct id
return group;
-
+
}
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryHelper.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryHelper.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryHelper.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryHelper.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.memory;
/*
- * 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;
@@ -34,12 +37,12 @@
/** Our Unique ID counter */
private static int uniqueId = 0;
-
+
public static Integer getUniqueId()
{
return new Integer(++uniqueId);
}
-
+
public static boolean checkExists(List securityEntities, String name){
boolean exists = false;
for (Iterator i = securityEntities.iterator(); i.hasNext();)
@@ -50,6 +53,6 @@
exists = true;
}
}
- return exists;
+ return exists;
}
}
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.memory;
/*
- * 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;
import java.util.List;
@@ -27,7 +30,7 @@
/**
* This implementation keeps all objects in memory. This is mostly meant to help with testing and
* prototyping of ideas.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -38,10 +41,10 @@
/** Our Unique ID counter */
// private static int uniqueId = 0;
-
+
/**
* Retrieves all permissions defined in the system.
- *
+ *
* @return the names of all permissions defined in the system.
* @throws DataBackendException if there was an error accessing the data backend.
*/
@@ -51,7 +54,7 @@
}
/**
* Renames an existing Permission.
- *
+ *
* @param permission The object describing the permission to be renamed.
* @param name the new name for the permission.
* @throws DataBackendException if there was an error accessing the data backend.
@@ -86,10 +89,10 @@
throw new UnknownEntityException(
"Unknown permission '" + permission + "'");
}
-
+
/**
* Determines if the <code>Permission</code> exists in the security system.
- *
+ *
* @param permission a <code>String</code> value
* @return true if the permission exists in the system, false otherwise
* @throws DataBackendException when more than one Permission with the same name exists.
@@ -99,11 +102,11 @@
throws DataBackendException
{
return MemoryHelper.checkExists(permissions,permissionName);
- }
+ }
/**
* Removes a Permission from the system.
- *
+ *
* @param permission The object describing the permission to be removed.
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the permission does not exist.
@@ -135,7 +138,7 @@
}
/**
* Creates a new permission with specified attributes.
- *
+ *
* @param permission the object describing the permission to be created.
* @return a new Permission object that has id set up properly.
* @throws DataBackendException if there was an error accessing the data backend.
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.memory;
/*
- * 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;
import java.util.List;
@@ -73,10 +76,10 @@
}
throw new UnknownEntityException("Unknown role '" + role + "'");
}
-
+
/**
* Determines if the <code>Role</code> exists in the security system.
- *
+ *
* @param permission a <code>String</code> value
* @return true if the role exists in the system, false otherwise
* @throws DataBackendException when more than one Role with the same name exists.
@@ -84,8 +87,8 @@
*/
public boolean checkExists(String roleName)
{
- return MemoryHelper.checkExists(roles,roleName);
- }
+ return MemoryHelper.checkExists(roles,roleName);
+ }
/**
* Retrieves all roles defined in the system.
*
@@ -151,5 +154,5 @@
}
throw new UnknownEntityException("Unknown role '" + role + "'");
}
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.memory;
/*
- * 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;
import java.util.List;
@@ -36,7 +39,7 @@
extends AbstractUserManager
{
private static List users = new ArrayList();
-
+
/** Our Unique ID counter */
// private static int uniqueId = 0;
@@ -52,20 +55,20 @@
*/
public boolean checkExists(String userName) throws DataBackendException
{
- return MemoryHelper.checkExists(users,userName);
-
+ return MemoryHelper.checkExists(users,userName);
+
}
-
+
/**
* Retrieves all users defined in the system.
- *
+ *
* @return the names of all users defined in the system.
* @throws DataBackendException if there was an error accessing the data backend.
*/
public UserSet getAllUsers() throws DataBackendException
{
return new UserSet(users);
- }
+ }
/**
* Removes an user account from the system.
*
@@ -92,12 +95,12 @@
protected User persistNewUser(User user)
throws DataBackendException
{
-
+
users.remove(user);
user.setId(MemoryHelper.getUniqueId());
users.add(user);
return user;
-
+
}
/**
* Stores User attributes. The User is required to exist in the system.
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/basic/MemoryModelManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/basic/MemoryModelManagerImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/basic/MemoryModelManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/basic/MemoryModelManagerImpl.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.memory.basic;
/*
- * 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;
@@ -29,7 +32,7 @@
/**
* This implementation keeps all objects in memory. This is mostly meant to help with testing and
* prototyping of ideas.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -39,9 +42,9 @@
{
/**
* Puts a user in a group.
- *
+ *
* This method is used when adding a user to a group
- *
+ *
* @param user the User.
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the account is not present.
@@ -65,7 +68,7 @@
{
throw new DataBackendException("grant(Role,Permission) failed", e);
}
-
+
if (!groupExists)
{
throw new UnknownEntityException("Unknown group '" + group.getName() + "'");
@@ -77,9 +80,9 @@
}
/**
* Removes a user in a group.
- *
+ *
* This method is used when removing a user to a group
- *
+ *
* @param user the User.
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the user or group is not present.
@@ -103,7 +106,7 @@
{
throw new DataBackendException("grant(Role,Permission) failed", e);
}
-
+
if (!groupExists)
{
throw new UnknownEntityException("Unknown group '" + group.getName() + "'");
@@ -115,9 +118,9 @@
}
/**
* Revokes all groups from a user
- *
+ *
* This method is used when deleting an account.
- *
+ *
* @param user the User.
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the account is not present.
@@ -144,7 +147,7 @@
{
throw new DataBackendException("revokeAll(User) failed:" + e.getMessage(), e);
}
-
+
throw new UnknownEntityException("Unknown user '" + user.getName() + "'");
}
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/dynamic/MemoryModelManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/dynamic/MemoryModelManagerImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/dynamic/MemoryModelManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/dynamic/MemoryModelManagerImpl.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.memory.dynamic;
/*
- * 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.Group;
import org.apache.fulcrum.security.entity.Permission;
@@ -30,7 +33,7 @@
/**
* This implementation keeps all objects in memory. This is mostly meant to help with testing and
* prototyping of ideas.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -40,9 +43,9 @@
{
/**
* Puts a user in a group.
- *
+ *
* This method is used when adding a user to a group
- *
+ *
* @param user the User.
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the account is not present.
@@ -66,7 +69,7 @@
{
throw new DataBackendException("grant(Role,Permission) failed", e);
}
-
+
if (!groupExists)
{
throw new UnknownEntityException("Unknown group '" + group.getName() + "'");
@@ -78,9 +81,9 @@
}
/**
* Removes a user in a group.
- *
+ *
* This method is used when removing a user to a group
- *
+ *
* @param user the User.
* @throws DataBackendException if there was an error accessing the data backend.
* @throws UnknownEntityException if the user or group is not present.
@@ -104,7 +107,7 @@
{
throw new DataBackendException("grant(Role,Permission) failed", e);
}
-
+
if (!groupExists)
{
throw new UnknownEntityException("Unknown group '" + group.getName() + "'");
@@ -117,7 +120,7 @@
/**
* Grants a Group a Role
- *
+ *
* @param group the Group.
* @param role the Role.
* @throws DataBackendException if there was an error accessing the data backend.
@@ -154,7 +157,7 @@
}
/**
* Revokes a Role from a Group.
- *
+ *
* @param group the Group.
* @param role the Role.
* @throws DataBackendException if there was an error accessing the data backend.
@@ -180,7 +183,7 @@
{
throw new DataBackendException("revoke(Group,Role) failed", e);
}
-
+
if (!groupExists)
{
throw new UnknownEntityException("Unknown group '" + group.getName() + "'");
@@ -192,7 +195,7 @@
}
/**
* Grants a Role a Permission
- *
+ *
* @param role the Role.
* @param permission the Permission.
* @throws DataBackendException if there was an error accessing the data backend.
@@ -230,7 +233,7 @@
}
/**
* Revokes a Permission from a Role.
- *
+ *
* @param role the Role.
* @param permission the Permission.
* @throws DataBackendException if there was an error accessing the data backend.
@@ -256,7 +259,7 @@
{
throw new DataBackendException("revoke(Role,Permission) failed", e);
}
-
+
if (!roleExists)
{
throw new UnknownEntityException("Unknown role '" + role.getName() + "'");
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerImpl.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.security.memory.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;
@@ -34,16 +37,16 @@
/**
* This implementation keeps all objects in memory. This is mostly meant to help
* with testing and prototyping of ideas.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh </a>
* @version $Id: MemoryTurbineModelManagerImpl.java,v 1.2 2004/07/07 16:51:27
* epugh Exp $
*/
-public class MemoryTurbineModelManagerImpl extends AbstractTurbineModelManager implements TurbineModelManager
+public class MemoryTurbineModelManagerImpl extends AbstractTurbineModelManager implements TurbineModelManager
{
/**
* Grants a Role a Permission
- *
+ *
* @param role
* the Role.
* @param permission
@@ -79,7 +82,7 @@
/**
* Revokes a Permission from a Role.
- *
+ *
* @param role
* the Role.
* @param permission
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineUserManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineUserManagerImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineUserManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/turbine/MemoryTurbineUserManagerImpl.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.memory.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.lang.StringUtils;
import org.apache.fulcrum.security.entity.User;
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/ACLComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/ACLComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/ACLComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/ACLComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<componentConfig>
- <acl/>
-</componentConfig>
\ No newline at end of file
+ <acl/>
+</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/BasicMemoryComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/BasicMemoryComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/BasicMemoryComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/BasicMemoryComponentConfig.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>
<securityService/>
<authenticator/>
@@ -5,8 +24,8 @@
<aclFactory/>
<userManager>
<className>org.apache.fulcrum.security.model.basic.entity.impl.BasicUserImpl</className>
- </userManager>
+ </userManager>
<groupManager>
<className>org.apache.fulcrum.security.model.basic.entity.impl.BasicGroupImpl</className>
</groupManager>
-</my-system>
\ No newline at end of file
+</my-system>
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/BasicMemoryRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/BasicMemoryRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/BasicMemoryRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/BasicMemoryRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
@@ -16,14 +35,14 @@
<role
name="org.apache.fulcrum.security.ModelManager"
shorthand="modelManager"
- default-class="org.apache.fulcrum.security.memory.basic.MemoryModelManagerImpl"/>
+ default-class="org.apache.fulcrum.security.memory.basic.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.basic.BasicACLFactory"/>
+ default-class="org.apache.fulcrum.security.model.basic.BasicACLFactory"/>
</role-list>
-
\ No newline at end of file
+
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/DynamicACLRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/DynamicACLRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/DynamicACLRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/DynamicACLRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
name="org.apache.fulcrum.security.model.ACLFactory"
shorthand="acl"
default-class="org.apache.fulcrum.security.model.dynamic.DynamicACLFactory"/>
-</role-list>
\ No newline at end of file
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/DynamicMemoryComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/DynamicMemoryComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/DynamicMemoryComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/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>
<securityService/>
<authenticator/>
@@ -5,14 +24,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>
<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/memory/src/test/DynamicMemoryRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/DynamicMemoryRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/DynamicMemoryRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/DynamicMemoryRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
@@ -24,14 +43,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/memory/src/test/LazyLoadComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/LazyLoadComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/LazyLoadComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/LazyLoadComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,9 +1,28 @@
+<?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>
<securityService/>
<userManager>
<className>org.apache.fulcrum.security.model.basic.entity.impl.BasicUserImpl</className>
- </userManager>
+ </userManager>
<groupManager>
<className>org.apache.fulcrum.security.model.basic.entity.impl.BasicGroupImpl</className>
</groupManager>
-</my-system>
\ No newline at end of file
+</my-system>
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/LazyLoadRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/LazyLoadRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/LazyLoadRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/LazyLoadRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
@@ -13,6 +32,6 @@
name="org.apache.fulcrum.security.GroupManager"
shorthand="groupManager"
default-class="org.apache.fulcrum.security.memory.MemoryGroupManagerImpl"/>
-
+
</role-list>
-
\ No newline at end of file
+
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/Log4j.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/Log4j.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/Log4j.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/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/memory/src/test/TurbineMemoryComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/TurbineMemoryComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/TurbineMemoryComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/TurbineMemoryComponentConfig.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>
<securityService/>
<authenticator/>
@@ -5,7 +24,7 @@
<aclFactory/>
<userManager>
<className>org.apache.fulcrum.security.model.turbine.entity.impl.TurbineUserImpl</className>
- </userManager>
+ </userManager>
<groupManager>
<className>org.apache.fulcrum.security.model.turbine.entity.impl.TurbineGroupImpl</className>
</groupManager>
@@ -15,4 +34,4 @@
<permissionManager>
<className>org.apache.fulcrum.security.model.turbine.entity.impl.TurbinePermissionImpl</className>
</permissionManager>
-</my-system>
\ No newline at end of file
+</my-system>
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/TurbineMemoryRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/TurbineMemoryRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/TurbineMemoryRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/TurbineMemoryRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
@@ -24,14 +43,14 @@
<role
name="org.apache.fulcrum.security.ModelManager"
shorthand="modelManager"
- default-class="org.apache.fulcrum.security.memory.turbine.MemoryTurbineModelManagerImpl"/>
+ default-class="org.apache.fulcrum.security.memory.turbine.MemoryTurbineModelManagerImpl"/>
<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
+
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org