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 [20/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/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/PermissionAdapter.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/PermissionAdapter.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/PermissionAdapter.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/PermissionAdapter.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.fulcrum.security.entity.SecurityEntity;
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/RoleAdapter.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/RoleAdapter.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/RoleAdapter.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/RoleAdapter.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.fulcrum.security.entity.SecurityEntity;
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdapter.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdapter.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdapter.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdapter.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.Iterator;
import java.util.List;
@@ -42,14 +45,14 @@
/**
* An implementation of SecurityService that adapts it to work with
- * Fulcrum Security. This adapter currently uses the "Simple" model of
- * security. However, it should actually use the "Turbine" model of
+ * Fulcrum Security. This adapter currently uses the "Simple" model of
+ * security. However, it should actually use the "Turbine" model of
* security. I didn't do that because I don't quite understand some of
* the reasons behind the "Turbine" model.
- *
+ *
* All the methods that currently throw a not implemented RuntimeException
* could easily delegate their calls to the Fulcrum SecurityService.
- *
+ *
*
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
@@ -60,7 +63,7 @@
private static Log log = LogFactory.getLog(SecurityServiceAdapter.class);
/** Our Fulcrum Security Service to use */
SecurityService securityService;
- /**
+ /**
* Hook into the init() calls so our adapter can load up from Avalon
* the securityManager it needs.
*/
@@ -767,7 +770,7 @@
dbe);
}
}
- /*
+ /*
* @see org.apache.turbine.services.security.SecurityService#accountExists(org.apache.turbine.om.security.User)
*/
public boolean accountExists(User arg0)
@@ -775,7 +778,7 @@
{
return accountExists(arg0.getName());
}
- /*
+ /*
* @see org.apache.turbine.services.security.SecurityService#getAuthenticatedUser(java.lang.String, java.lang.String)
*/
public User getAuthenticatedUser(String arg0, String arg1)
@@ -812,7 +815,7 @@
dbe);
}
}
- /*
+ /*
* @see org.apache.turbine.services.security.SecurityService#getUser(java.lang.String)
*/
public User getUser(String arg0)
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/UserAdapter.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/UserAdapter.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/UserAdapter.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/java/org/apache/fulcrum/security/adapter/turbine/UserAdapter.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.Date;
import java.util.Hashtable;
@@ -31,11 +34,11 @@
*/
public class UserAdapter extends BaseAdapter implements User
{
-
+
/*
* turbineUser object to delegate extra methods that the fulcrum user
* doesn't support
- */
+ */
private TurbineUser turbineUser;
@@ -79,7 +82,7 @@
{
return null;
}
- /*
+ /*
* @see org.apache.turbine.om.security.User#getPassword()
*/
public String getPassword()
@@ -110,7 +113,7 @@
return null;
}
- /*
+ /*
* @see org.apache.turbine.om.security.User#getTempStorage()
*/
public Hashtable getTempStorage()
@@ -118,7 +121,7 @@
return turbineUser.getTempStorage();
}
- /*
+ /*
* @see org.apache.turbine.om.security.User#getTemp(java.lang.String)
*/
public Object getTemp(String arg0)
@@ -126,7 +129,7 @@
return turbineUser.getTemp(arg0);
}
- /*
+ /*
* @see org.apache.turbine.om.security.User#getTemp(java.lang.String, java.lang.Object)
*/
public Object getTemp(String arg0, Object arg1)
@@ -165,14 +168,14 @@
return null;
}
- /*
+ /*
* @see org.apache.turbine.om.security.User#setHasLoggedIn(java.lang.Boolean)
*/
public void setHasLoggedIn(Boolean arg0)
{
turbineUser.setHasLoggedIn(arg0);
}
- /*
+ /*
* @see org.apache.turbine.om.security.User#hasLoggedIn()
*/
public boolean hasLoggedIn()
@@ -193,7 +196,7 @@
{
}
- /*
+ /*
* @see org.apache.turbine.om.security.User#removeTemp(java.lang.String)
*/
public Object removeTemp(String arg0)
@@ -228,7 +231,7 @@
{
}
- /*
+ /*
* @see org.apache.turbine.om.security.User#setPassword(java.lang.String)
*/
public void setPassword(String arg0)
@@ -249,7 +252,7 @@
{
}
- /*
+ /*
* @see org.apache.turbine.om.security.User#setTempStorage(java.util.Hashtable)
*/
public void setTempStorage(Hashtable arg0)
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/AdapterTestTurbineResources.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/AdapterTestTurbineResources.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/AdapterTestTurbineResources.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/AdapterTestTurbineResources.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.
# This file is used with the roleTurbineConfiguration.xml and componentTurbineConfiguration
# to test the Turbine Security <--> Fulcrum Security Adapter.
@@ -33,8 +49,8 @@
#
# Notice there are no properties called
-# services.SecurityService.user.class,
-# services.SecurityService.group.class,
+# services.SecurityService.user.class,
+# services.SecurityService.group.class,
# services.SecurityService.user.manager etc...
# This is because we don't specify the class through here, but through the avalon configuration.
#
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/AdapterTestTurbineResourcesBasicModel.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/AdapterTestTurbineResourcesBasicModel.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/AdapterTestTurbineResourcesBasicModel.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/AdapterTestTurbineResourcesBasicModel.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.
# This file is used with the roleTurbineConfiguration.xml and componentTurbineConfiguration
# to test the Turbine Security <--> Fulcrum Security Adapter.
@@ -33,8 +49,8 @@
#
# Notice there are no properties called
-# services.SecurityService.user.class,
-# services.SecurityService.group.class,
+# services.SecurityService.user.class,
+# services.SecurityService.group.class,
# services.SecurityService.user.manager etc...
# This is because we don't specify the class through here, but through the avalon configuration.
#
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/Log4j.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/Log4j.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/Log4j.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/Log4j.properties Fri May 4 23:58:06 2007
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
# ------------------------------------------------------------------------
#
# Logging Configuration
@@ -24,11 +40,11 @@
log4j.category.avalon = INFO, avalon
log4j.additivity.avalon = false
-########################################################################
+# #######################################################################
#
# Logfile definitions
#
-########################################################################
+# #######################################################################
#
# turbine.log
@@ -41,7 +57,7 @@
#
# torque.log
-#
+#
log4j.appender.torque = org.apache.log4j.FileAppender
log4j.appender.torque.file = target/torque.log
log4j.appender.torque.layout = org.apache.log4j.PatternLayout
@@ -60,31 +76,31 @@
# BEGIN HIBERNATE SECTION
-### direct log messages to stdout ###
+# ## direct log messages to stdout ###
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-### direct messages to file hibernate.log ###
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+# ## direct messages to file hibernate.log ###
+# log4j.appender.file=org.apache.log4j.FileAppender
+# log4j.appender.file.File=hibernate.log
+# log4j.appender.file.layout=org.apache.log4j.PatternLayout
+# log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-### set log levels - for more verbose logging change 'info' to 'debug' ##
+# ## set log levels - for more verbose logging change 'info' to 'debug' ##
log4j.rootLogger=warn, stdout
log4j.logger.net.sf.hibernate=warn
-### enable the following line if you want to track down connection ###
-### leakages when using DriverManagerConnectionProvider ###
-#log4j.logger.net.sf.hibernate.connection.DriverManagerConnectionProvider=trace
+# ## enable the following line if you want to track down connection ###
+# ## leakages when using DriverManagerConnectionProvider ###
+# log4j.logger.net.sf.hibernate.connection.DriverManagerConnectionProvider=trace
-### log JDBC bind parameters ###
+# ## log JDBC bind parameters ###
log4j.logger.net.sf.hibernate.type=info
-### log prepared statement cache activity ###
+# ## log prepared statement cache activity ###
log4j.logger.net.sf.hibernate.ps.PreparedStatementCache=info
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/componentTurbineConfiguration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/componentTurbineConfiguration.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/componentTurbineConfiguration.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/componentTurbineConfiguration.xml Fri May 4 23:58:06 2007
@@ -1,20 +1,39 @@
+<?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 adapter
classes for Dynamic. -->
<componentConfig>
<securityService/>
- <userManager>
- <className>org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicUserImpl</className>
+ <userManager>
+ <className>org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicUserImpl</className>
</userManager>
- <groupManager>
- <className>org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicGroupImpl</className>
+ <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>
+ <className>org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicRoleImpl</className>
</roleManager>
- <permissionManager>
- <className>org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicPermissionImpl</className>
+ <permissionManager>
+ <className>org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicPermissionImpl</className>
</permissionManager>
- <modelManager/>
- <aclFactory/>
+ <modelManager/>
+ <aclFactory/>
</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/componentTurbineConfigurationBasicModel.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/componentTurbineConfigurationBasicModel.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/componentTurbineConfigurationBasicModel.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/componentTurbineConfigurationBasicModel.xml Fri May 4 23:58:06 2007
@@ -1,14 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- This configuration file for Avalon components is used for testing the adapter
classes for Dynamic. -->
<componentConfig>
<securityService/>
- <userManager>
+ <userManager>
<className>org.apache.fulcrum.security.model.basic.entity.impl.BasicUserImpl</className>
</userManager>
- <groupManager>
+ <groupManager>
<className>org.apache.fulcrum.security.model.basic.entity.impl.BasicGroupImpl</className>
</groupManager>
- <modelManager/>
- <aclFactory/>
+ <modelManager/>
+ <aclFactory/>
</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AbstractAccessControlListAdaptorTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AbstractAccessControlListAdaptorTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AbstractAccessControlListAdaptorTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AbstractAccessControlListAdaptorTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.Vector;
@@ -39,7 +42,7 @@
/**
* Test that we can load up a fulcrum ACL in Turbine, without Turbine
* knowing that anything has changed.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -51,13 +54,13 @@
protected TurbineConfig tc;
protected MockHttpSession session;
protected AvalonComponentService acs;
-
+
public abstract String getTRProps();
public AbstractAccessControlListAdaptorTest(String name) throws Exception
{
super(name);
}
-
+
public void setUp() throws Exception
{
super.setUp();
@@ -70,8 +73,8 @@
acs =
(AvalonComponentService) TurbineServices.getInstance().getService(
AvalonComponentService.SERVICE_NAME);
- }
-
+ }
+
protected User getUserFromRunData(HttpSession session) throws Exception
{
RunDataService rds =
@@ -100,7 +103,7 @@
return turbineUser;
}
-
+
public void tearDown()
{
super.tearDown();
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdaptorBasicModelTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdaptorBasicModelTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdaptorBasicModelTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdaptorBasicModelTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.fulcrum.security.BaseSecurityService;
import org.apache.fulcrum.security.entity.Group;
@@ -26,7 +29,7 @@
/**
* Test that we can load up a fulcrum ACL in Turbine, without Turbine
* knowing that anything has changed.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -37,7 +40,7 @@
public String getTRProps(){
return "AdapterTestTurbineResourcesBasicModel.properties";
}
-
+
public AccessControlListAdaptorBasicModelTest(String name) throws Exception
{
super(name);
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdaptorTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdaptorTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdaptorTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdaptorTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.HashMap;
import java.util.Map;
@@ -35,7 +38,7 @@
/**
* Test that we can load up a fulcrum ACL in Turbine, without Turbine
* knowing that anything has changed.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -47,7 +50,7 @@
public String getTRProps(){
return "AdapterTestTurbineResources.properties";
}
-
+
public AccessControlListAdaptorTest(String name) throws Exception
{
super(name);
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/BaseAdapterTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/BaseAdapterTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/BaseAdapterTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/BaseAdapterTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import junit.framework.TestCase;
@@ -21,9 +24,9 @@
import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
import org.apache.fulcrum.security.model.dynamic.entity.DynamicUser;
/**
- * Test that we can use a BaseAdapter with a SecurityEntity that has
+ * Test that we can use a BaseAdapter with a SecurityEntity that has
* various types of Id objects.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/BetterMockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/BetterMockHttpServletRequest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/BetterMockHttpServletRequest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/BetterMockHttpServletRequest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import com.mockobjects.servlet.MockHttpServletRequest;
@@ -20,7 +23,7 @@
/**
* Needed to extend the stand MockHttpServletRequest to work with
* Turbine.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/GroupAdapterTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/GroupAdapterTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/GroupAdapterTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/GroupAdapterTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import junit.framework.TestCase;
@@ -20,9 +23,9 @@
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.model.dynamic.entity.DynamicGroup;
/**
- * Test that we can use a GroupAdapter with a Group that has
+ * Test that we can use a GroupAdapter with a Group that has
* various types of Id objects.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdaptorTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdaptorTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdaptorTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdaptorTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.fulcrum.testcontainer.BaseUnitTest;
import org.apache.turbine.om.security.User;
@@ -24,7 +27,7 @@
/**
* Test that the SecurityServiceAdapter works properly.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -55,7 +58,7 @@
assertFalse(TurbineSecurity.getService().accountExists(user));
}
-
+
public void testCreateUser() throws Exception
{
@@ -65,7 +68,7 @@
TurbineSecurity.getService().addUser(user,"fakepasswrod");
assertTrue(TurbineSecurity.getService().accountExists(user));
- }
+ }
public void tearDown()
{
@@ -73,6 +76,6 @@
serviceManager.shutdownService(SecurityService.SERVICE_NAME);
serviceManager.shutdownServices();
}
-
-
+
+
}
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/UserAdapterTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/UserAdapterTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/UserAdapterTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/org/apache/fulcrum/security/adapter/turbine/UserAdapterTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.adapter.turbine;
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import junit.framework.TestCase;
@@ -21,7 +24,7 @@
import org.apache.fulcrum.security.model.dynamic.entity.DynamicUser;
/**
* Test that we can use a UserAdapter properly.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -62,7 +65,7 @@
assertEquals(new Integer(56), ga.getIdAsObj());
}
-
+
public void testSetGetTemp(){
User user = new DynamicUser();
user.setId("56");
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/roleTurbineConfiguration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/roleTurbineConfiguration.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/roleTurbineConfiguration.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/roleTurbineConfiguration.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 adapter
classes for Turbine. -->
@@ -5,30 +24,30 @@
<role name="org.apache.fulcrum.security.SecurityService"
shorthand="securityService"
default-class="org.apache.fulcrum.security.BaseSecurityService" />
-
+
<role name="org.apache.fulcrum.security.UserManager"
shorthand="userManager"
default-class="org.apache.fulcrum.security.memory.turbine.MemoryTurbineUserManagerImpl" />
-
+
<role name="org.apache.fulcrum.security.GroupManager"
shorthand="groupManager"
default-class="org.apache.fulcrum.security.memory.MemoryGroupManagerImpl" />
-
+
<role name="org.apache.fulcrum.security.RoleManager"
shorthand="roleManager"
- default-class="org.apache.fulcrum.security.memory.MemoryRoleManagerImpl" />
+ default-class="org.apache.fulcrum.security.memory.MemoryRoleManagerImpl" />
<role name="org.apache.fulcrum.security.PermissionManager"
shorthand="permissionManager"
- default-class="org.apache.fulcrum.security.memory.MemoryPermissionManagerImpl" />
+ default-class="org.apache.fulcrum.security.memory.MemoryPermissionManagerImpl" />
<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.model.ACLFactory"
shorthand="aclFactory"
- default-class="org.apache.fulcrum.security.model.dynamic.DynamicACLFactory" />
-
-</role-list>
-
\ No newline at end of file
+ default-class="org.apache.fulcrum.security.model.dynamic.DynamicACLFactory" />
+
+</role-list>
+
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/roleTurbineConfigurationBasicModel.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/roleTurbineConfigurationBasicModel.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/roleTurbineConfigurationBasicModel.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/src/test/roleTurbineConfigurationBasicModel.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 adapter
classes for Turbine. -->
@@ -5,24 +24,24 @@
<role name="org.apache.fulcrum.security.SecurityService"
shorthand="securityService"
default-class="org.apache.fulcrum.security.BaseSecurityService" />
-
+
<role name="org.apache.fulcrum.security.UserManager"
shorthand="userManager"
default-class="org.apache.fulcrum.security.memory.MemoryUserManagerImpl" />
-
+
<role name="org.apache.fulcrum.security.GroupManager"
shorthand="groupManager"
default-class="org.apache.fulcrum.security.memory.MemoryGroupManagerImpl" />
-
-
+
+
<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.model.ACLFactory"
shorthand="aclFactory"
- default-class="org.apache.fulcrum.security.model.basic.BasicACLFactory" />
-
-</role-list>
-
\ No newline at end of file
+ default-class="org.apache.fulcrum.security.model.basic.BasicACLFactory" />
+
+</role-list>
+
Modified: jakarta/turbine/fulcrum/trunk/security/adapters/turbine/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/adapters/turbine/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/adapters/turbine/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/adapters/turbine/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/api/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/maven.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/security/api/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/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/api/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/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-api</id>
@@ -6,31 +24,31 @@
<dependencies>
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-crypto</artifactId>
<version>1.0.5</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>cryptix</groupId>
<artifactId>cryptix</artifactId>
<version>3.2.0</version>
<url>http://www.cryptix.org/</url>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
- </dependency>
-
-
+ </dependency>
+
+
</dependencies>
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security;
/*
- * 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.avalon.framework.activity.Initializable;
@@ -26,13 +29,13 @@
import org.apache.avalon.framework.thread.ThreadSafe;
/**
* This a basis implementation of the Fulcrum security service.
- *
+ *
* Provided functionality includes:
* <ul>
* <li>methods for retrieving different types of managers.
* <li>avalon lifecyle managers.
* </ul>
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric PUgh</a>
* @version $Id$
*/
@@ -61,7 +64,7 @@
protected ModelManager modelManager = null;
/**
* Returns the configured UserManager.
- *
+ *
* @return An UserManager object
*/
public UserManager getUserManager()
@@ -82,7 +85,7 @@
}
/**
* Returns the configured GroupManager.
- *
+ *
* @return An UserManager object
*/
public GroupManager getGroupManager()
@@ -103,7 +106,7 @@
}
/**
* Returns the configured RoleManager.
- *
+ *
* @return An RoleManager object
*/
public RoleManager getRoleManager()
@@ -124,7 +127,7 @@
}
/**
* Returns the configured PermissionManager.
- *
+ *
* @return An PermissionManager object
*/
public PermissionManager getPermissionManager()
@@ -145,7 +148,7 @@
}
/**
* Returns the configured ModelManager.
- *
+ *
* @return An ModelManager object
*/
public ModelManager getModelManager()
@@ -166,7 +169,7 @@
}
/**
* Configure a new role Manager.
- *
+ *
* @param -ermissionManager An PermissionManager object
*/
// void setPermissionManager(PermissionManager permissionManager);
@@ -183,13 +186,13 @@
public void service(ServiceManager manager) throws ServiceException
{
this.manager = manager;
-
+
}
/**
* Avalon Service lifecycle method Initializes the SecurityService, locating the apropriate
* UserManager
- *
+ *
* @throws Exception A Problem occured while initializing the User Manager.
*/
public void initialize() throws Exception
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/GroupManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/GroupManager.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/GroupManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/GroupManager.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security;
/*
- * 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.avalon.framework.component.Component;
import org.apache.fulcrum.security.entity.Group;
@@ -34,10 +37,10 @@
public interface GroupManager
extends Component
{
-
+
/** Avalon role - used to id the component within the manager */
String ROLE = GroupManager.class.getName();
-
+
/**
* Construct a blank Group object.
*
@@ -70,7 +73,7 @@
* @throws UnknownEntityException if the group does not exist.
*/
Group getGroupByName(String name) throws DataBackendException, UnknownEntityException;
-
+
/**
* Retrieve a Group object with specified Id.
*
@@ -84,9 +87,9 @@
* storage.
*/
Group getGroupById(Object id) throws DataBackendException, UnknownEntityException;
-
-
-
+
+
+
/**
* Renames an existing Group.
*
@@ -97,8 +100,8 @@
* @throws UnknownEntityException if the group does not exist.
*/
void renameGroup(Group group, String name)
- throws DataBackendException, UnknownEntityException;
-
+ throws DataBackendException, UnknownEntityException;
+
/**
* Removes a Group from the system.
*
@@ -109,7 +112,7 @@
*/
void removeGroup(Group group)
throws DataBackendException, UnknownEntityException;
-
+
/**
* Creates a new group with specified attributes.
*
@@ -121,7 +124,7 @@
*/
Group addGroup(Group group)
throws DataBackendException, EntityExistsException;
-
+
/**
* Retrieves all groups defined in the system.
*
@@ -131,7 +134,7 @@
*/
GroupSet getAllGroups()
throws DataBackendException;
-
+
/**
* Determines if the <code>Group</code> exists in the security system.
*
@@ -141,12 +144,12 @@
* the same name exists.
* @throws Exception A generic exception.
*/
- public boolean checkExists(Group group) throws DataBackendException;
-
+ public boolean checkExists(Group group) throws DataBackendException;
+
/**
* Determines if a <code>Group</code> exists in the security system
* with the specified name.
- *
+ *
* @param groupName the name of a <code>Group</code> to check.
* @return true if the group exists in the system, false otherwise
* @throws DataBackendException
@@ -154,6 +157,6 @@
* @throws Exception
* A generic exception.
*/
- public boolean checkExists(String group) throws DataBackendException;
-
+ public boolean checkExists(String group) throws DataBackendException;
+
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/ModelManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/ModelManager.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/ModelManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/ModelManager.java Fri May 4 23:58:06 2007
@@ -1,24 +1,27 @@
package org.apache.fulcrum.security;
/*
- * 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.avalon.framework.component.Component;
/**
* Right now is just a marker interface, and provides the Role name.
- *
+ *
*
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
@@ -27,7 +30,7 @@
{
/** Avalon role - used to id the component within the manager */
String ROLE = ModelManager.class.getName();
-
-
+
+
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security;
/*
- * 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.avalon.framework.component.Component;
import org.apache.fulcrum.security.entity.Permission;
@@ -34,7 +37,7 @@
public interface PermissionManager
extends Component
{
-
+
/** Avalon role - used to id the component within the manager */
String ROLE = PermissionManager.class.getName();
/**
@@ -59,7 +62,7 @@
* @throws UnknownEntityException if the object could not be instantiated.
*/
Permission getPermissionInstance(String permName) throws UnknownEntityException;
-
+
/**
* Retrieve a Permission object with specified name.
*
@@ -91,7 +94,7 @@
* backend.
*/
PermissionSet getAllPermissions() throws DataBackendException;
-
+
/**
* Creates a new permission with specified attributes.
*
@@ -121,7 +124,7 @@
* @throws UnknownEntityException if the permission does not exist.
*/
void renamePermission(Permission permission, String name) throws DataBackendException, UnknownEntityException;
-
+
/**
* Determines if the <code>Permission</code> exists in the security system.
*
@@ -131,12 +134,12 @@
* the same name exists.
* @throws Exception A generic exception.
*/
- boolean checkExists(Permission permission) throws DataBackendException;
-
+ boolean checkExists(Permission permission) throws DataBackendException;
+
/**
* Determines if a <code>Permission</code> exists in the security
* system with the specified name.
- *
+ *
* @param permissionName the name of a <code>Permission</code> to check
* @return true if the permission exists in the system, false otherwise
* @throws DataBackendException
@@ -144,5 +147,5 @@
* @throws Exception
* A generic exception.
*/
- boolean checkExists(String permissionName) throws DataBackendException;
+ boolean checkExists(String permissionName) throws DataBackendException;
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/RoleManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/RoleManager.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/RoleManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/RoleManager.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security;
/*
- * 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.avalon.framework.component.Component;
import org.apache.fulcrum.security.entity.Role;
@@ -57,7 +60,7 @@
* @throws DataBackendException if the object could not be instantiated.
*/
Role getRoleInstance(String roleName) throws DataBackendException;
-
+
/**
* Retrieve a Role object with specified name.
*
@@ -119,7 +122,7 @@
* @throws UnknownEntityException if the role does not exist.
*/
void renameRole(Role role, String name) throws DataBackendException, UnknownEntityException;
-
+
/**
* Determines if the <code>Role</code> exists in the security system.
*
@@ -130,11 +133,11 @@
* @throws Exception A generic exception.
*/
boolean checkExists(Role role) throws DataBackendException;
-
+
/**
* Determines if a <code>Role</code> exists in the security system with
* the specified role name.
- *
+ *
* @param roleName
* the name of a <code>Role</code> to check.
* @return true if the role exists in the system, false otherwise
@@ -143,5 +146,5 @@
* @throws Exception
* A generic exception.
*/
- boolean checkExists(String roleName) throws DataBackendException;
+ boolean checkExists(String roleName) throws DataBackendException;
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/SecurityService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/SecurityService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/SecurityService.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/SecurityService.java Fri May 4 23:58:06 2007
@@ -1,31 +1,34 @@
package org.apache.fulcrum.security;
/*
- * 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.avalon.framework.component.Component;
/**
* The Security Service manages Users, Groups Roles and Permissions in the system.
- *
+ *
* The task performed by the security service include providing access to the various types of
* managers.
- *
+ *
* <p>
* Because of pluggable nature of the Services, it is possible to create multiple implementations
* of SecurityService, for example employing database and directory server as the data backend.
* <br>
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -35,34 +38,34 @@
/**
* Returns the configured UserManager.
- *
+ *
* @return An UserManager object
*/
UserManager getUserManager();
/**
* Returns the configured GroupManager.
- *
+ *
* @return An UserManager object
*/
GroupManager getGroupManager();
/**
* Returns the configured RoleManager.
- *
+ *
* @return An RoleManager object
*/
RoleManager getRoleManager();
/**
* Returns the configured PermissionManager.
- *
+ *
* @return An PermissionManager object
*/
PermissionManager getPermissionManager();
/**
* Returns the configured ModelManager object that can then
* be casted to the specific model.
- *
+ *
* @return An ModelManager object
*/
- ModelManager getModelManager();
+ ModelManager getModelManager();
}
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/UserManager.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/UserManager.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/UserManager.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/UserManager.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security;
/*
- * 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.avalon.framework.component.Component;
import org.apache.fulcrum.security.acl.AccessControlList;
@@ -60,7 +63,7 @@
* @throws DataBackendException if the object could not be instantiated.
*/
User getUserInstance(String userName) throws DataBackendException;
-
+
/**
* Determines if the <code>User</code> exists in the security system.
*
@@ -70,7 +73,7 @@
* the same name exists.
* @throws Exception A generic exception.
*/
- boolean checkExists(User user) throws DataBackendException;
+ boolean checkExists(User user) throws DataBackendException;
/**
* Check whether a specified user's account exists.
*
@@ -105,7 +108,7 @@
* @exception DataBackendException if there is a problem accessing the
* storage.
*/
- User getUserById(Object id) throws UnknownEntityException, DataBackendException;
+ User getUserById(Object id) throws UnknownEntityException, DataBackendException;
/**
* Retrieve a user from persistent storage using username as the
* key, and authenticate the user. The implementation may chose
@@ -132,7 +135,7 @@
* @throws DataBackendException if there was an error accessing the data
* backend.
*/
- UserSet getAllUsers() throws DataBackendException;
+ UserSet getAllUsers() throws DataBackendException;
/**
* Saves User's data in the permanent storage. The user account is required
* to exist in the storage.
@@ -208,7 +211,7 @@
* storage.
*/
void forcePassword(User user, String password) throws UnknownEntityException, DataBackendException;
-
+
/**
* Return a Class object representing the system's chosen implementation of
* of ACL interface.
@@ -218,9 +221,9 @@
* could not be determined, or does not exist.
*/
public AccessControlList getACL(User user) throws UnknownEntityException;
-
-
-
+
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org