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 [27/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/memory/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.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.service.ServiceException;
@@ -60,7 +63,7 @@
{
this.setRoleFileName("src/test/TurbineMemoryRoleConfig.xml");
this.setConfigurationFileName("src/test/TurbineMemoryComponentConfig.xml");
-
+
securityService = (SecurityService) lookup(SecurityService.ROLE);
assertTrue(
securityService.getUserManager()
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.acl;
/*
- * 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;
@@ -38,7 +41,7 @@
/**
* Test that we can generate AccessControlLists from the Factory
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryBasicModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryBasicModelManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryBasicModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryBasicModelManagerTest.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.
*/
@@ -41,7 +44,7 @@
this.setConfigurationFileName("src/test/BasicMemoryComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
super.setUp();
-
+
}
catch (Exception e)
{
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryGroupManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryGroupManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryGroupManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryGroupManagerTest.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 org.apache.fulcrum.security.SecurityService;
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryUserManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryUserManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryUserManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryUserManagerTest.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 org.apache.fulcrum.security.SecurityService;
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryDynamicModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryDynamicModelManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryDynamicModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryDynamicModelManagerTest.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.SecurityService;
@@ -39,7 +42,7 @@
this.setConfigurationFileName("src/test/DynamicMemoryComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
super.setUp();
-
+
}
catch (Exception e)
{
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryGroupManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryGroupManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryGroupManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryGroupManagerTest.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.SecurityService;
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryPermissionManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryPermissionManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryPermissionManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryPermissionManagerTest.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.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractPermissionManagerTest;
@@ -25,7 +28,7 @@
{
public void setUp()
- {
+ {
try
{
this.setRoleFileName("src/test/DynamicMemoryRoleConfig.xml");
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.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.RoleManager;
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryUserManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryUserManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryUserManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryUserManagerTest.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.SecurityService;
Modified: jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerTest.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.fulcrum.security.SecurityService;
Modified: jakarta/turbine/fulcrum/trunk/security/memory/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/memory/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/memory/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/memory/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/nt/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/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/nt/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/project.properties Fri May 4 23:58:06 2007
@@ -1,2 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
maven.multiproject.type=jar
maven.junit.fork=true
Modified: jakarta/turbine/fulcrum/trunk/security/nt/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/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-nt</id>
@@ -6,36 +24,36 @@
<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>
<dependency>
<groupId>tagishauth</groupId>
<artifactId>tagishauth</artifactId>
<version>1.0.3</version>
<url>http://free.tagish.net/jaas/index.jsp</url>
- </dependency>
-
+ </dependency>
+
<!-- testing -->
<dependency>
- <groupId>fulcrum</groupId>
+ <groupId>fulcrum</groupId>
<artifactId>fulcrum-security-memory</artifactId>
<version>1.0.7</version>
- </dependency>
+ </dependency>
</dependencies>
Modified: jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/authenticator/NTAuthenticator.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/authenticator/NTAuthenticator.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/authenticator/NTAuthenticator.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/authenticator/NTAuthenticator.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.authenticator;
/*
- * 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 javax.security.auth.login.LoginException;
@@ -25,7 +28,7 @@
import com.tagish.auth.win32.NTSystem;
/**
* This class authenticates a user against NT. Requires some
- * extra libraries.
+ * extra libraries.
*
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
@@ -36,7 +39,7 @@
* Authenticate an username with the specified password. If authentication
* is successful the method returns true. If it fails, it returns false
* If there are any problems, an exception is thrown.
- *
+ *
*
* @param usernameAndDomain an string in the format [domain]/[username].
* @param password the user supplied password.
Modified: jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/NTUserManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/NTUserManagerImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/NTUserManagerImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/NTUserManagerImpl.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.nt;
/*
- * 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 javax.security.auth.login.LoginException;
@@ -30,7 +33,7 @@
import com.tagish.auth.win32.NTSystem;
/**
* This implementation attempts to manager users against NT.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -45,7 +48,7 @@
* Retrieve a user from persistent storage using username as the key, and
* authenticate the user. The implementation may chose to authenticate to
* the server as the user whose data is being retrieved.
- *
+ *
* @param userName the name of the user.
* @param password the user supplied password.
* @return an User object.
@@ -66,9 +69,9 @@
/**
* Check whether a specified user's account exists.
- *
+ *
* The login name is used for looking up the account.
- *
+ *
* @param user The user to be checked.
* @return true if the specified account exists
* @throws DataBackendException if there was an error accessing the data
@@ -94,9 +97,9 @@
}
/**
* Check whether a specified user's account exists.
- *
+ *
* The login name is used for looking up the account.
- *
+ *
* @param userName The name of the user to be checked.
* @return true if the specified account exists
* @throws DataBackendException if there was an error accessing the data
@@ -110,7 +113,7 @@
/**
* Retrieve a user from persistent storage using username as the key. Not
* supported currently.
- *
+ *
* @param userName the name of the user.
* @return an User object.
* @exception UnknownEntityException if the user's account does not exist
@@ -129,7 +132,7 @@
* successful the method returns nothing. If there are any problems,
* exception was thrown. Additionally, if the User object is of type BasicUser
* or DynamicUser, then it will populate all the group information as well!
- *
+ *
* @param user an User object to authenticate.
* @param password the user supplied password.
* @exception PasswordMismatchException if the supplied password was
@@ -187,7 +190,7 @@
/**
* Removes an user account from the system. Not supported currently.
- *
+ *
* @param user the object describing the account to be removed.
* @throws DataBackendException if there was an error accessing the data
* backend.
@@ -201,10 +204,10 @@
/**
* Creates new user account with specified attributes. Not supported
* currently.
- *
+ *
* @param user the object describing account to be created.
* @param password The password to use for the account.
- *
+ *
* @throws DataBackendException if there was an error accessing the data
* backend.
* @throws EntityExistsException if the user account already exists.
@@ -217,7 +220,7 @@
/**
* Stores User attributes. The User is required to exist in the system. Not
* supported currently.
- *
+ *
* @param role The User to be stored.
* @throws DataBackendException if there was an error accessing the data
* backend.
@@ -228,16 +231,16 @@
{
throw new RuntimeException("Not supported by NT User Manager");
}
-
+
/**
* 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
{
throw new RuntimeException("Not supported by NT User Manager");
- }
+ }
}
Modified: jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/ParseUtils.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/ParseUtils.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/ParseUtils.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/ParseUtils.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.nt;
/*
- * 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 javax.security.auth.login.LoginException;
Modified: jakarta/turbine/fulcrum/trunk/security/nt/src/test/BasicNTComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/test/BasicNTComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/test/BasicNTComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/test/BasicNTComponentConfig.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
+ </groupManager>
+</my-system>
Modified: jakarta/turbine/fulcrum/trunk/security/nt/src/test/BasicNTRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/test/BasicNTRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/test/BasicNTRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/test/BasicNTRoleConfig.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/nt/src/test/DynamicNTComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/test/DynamicNTComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/test/DynamicNTComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/test/DynamicNTComponentConfig.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>
+ </groupManager>
<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>
-</my-system>
\ No newline at end of file
+</my-system>
Modified: jakarta/turbine/fulcrum/trunk/security/nt/src/test/DynamicNTRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/test/DynamicNTRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/test/DynamicNTRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/test/DynamicNTRoleConfig.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/nt/src/test/Log4j.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/test/Log4j.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/test/Log4j.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/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/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.nt.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.commons.logging.Log;
@@ -27,10 +30,10 @@
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
/**
- *
+ *
* Test the NT implementation of the user manager. This test traps some exceptions that can be
* thrown if there is NO nt dll.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
@@ -64,7 +67,7 @@
}
/**
* Constructor for MemoryPermissionManagerTest.
- *
+ *
* @param arg0
*/
public NTBasicACLTest(String arg0)
@@ -83,7 +86,7 @@
assertEquals(4,bacl.getGroups().size());
assertTrue(bacl.hasGroup("Guests"));
assertTrue(bacl.hasGroup("gUEsts"));
-
+
}
catch(DataBackendException dbe){
assertTrue(dbe.getMessage().indexOf(SCB_INVALID)>-1);
@@ -98,6 +101,6 @@
}
}
-
-
+
+
}
Modified: jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.nt.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.commons.logging.Log;
Modified: jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.nt.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.commons.logging.Log;
Modified: jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.nt.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.commons.logging.Log;
@@ -269,7 +272,7 @@
public void testForcePassword() throws Exception
{
try
- {
+ {
user = userManager.getUser(GUESTUSER, "");
user.setPassword("");
Modified: jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/TestConstants.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/TestConstants.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/TestConstants.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/TestConstants.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.security.nt.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.
*/
/**
Modified: jakarta/turbine/fulcrum/trunk/security/nt/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/nt/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/nt/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/nt/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/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/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-site</id>
@@ -19,7 +37,7 @@
<roles>
<role>Developer</role>
</roles>
- </contributor>
+ </contributor>
<contributor>
<name>Michael Jones</name>
<email>michael.jones@anite.com</email>
@@ -34,20 +52,20 @@
<roles>
<role>Developer</role>
</roles>
- </contributor>
+ </contributor>
</contributors>
-
+
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.1</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>commons-logging</groupId>
+ <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
- </dependency>
+ </dependency>
<!-- Needed only for testing -->
<dependency>
@@ -55,12 +73,12 @@
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
</dependency>
-
+
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.4</version>
- </dependency>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -70,7 +88,7 @@
<include>incl_nav.xml</include>
</includes>
</resource>
- </resources>
+ </resources>
</build>
</project>
Modified: jakarta/turbine/fulcrum/trunk/security/torque/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/maven.xml Fri May 4 23:58:06 2007
@@ -1,24 +1,43 @@
-<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
-
- <preGoal name="java:compile">
- <attainGoal name="torque:om"/>
- </preGoal>
-
- <preGoal name="torque:init">
- <attainGoal name="torque-gen:prepare"/>
- </preGoal>
-
- <goal name="torque-gen:prepare">
- <property file="project.properties" />
-
- <copy todir="${torque.schema.dir}">
- <fileset dir="schema">
- <include name="*" />
- </fileset>
- <filterset>
- <filter token="DATABASE_DEFAULT" value="${torque.project}"/>
- </filterset>
- </copy>
- </goal>
-
-</project>
\ No newline at end of file
+<?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">
+
+ <preGoal name="java:compile">
+ <attainGoal name="torque:om"/>
+ </preGoal>
+
+ <preGoal name="torque:init">
+ <attainGoal name="torque-gen:prepare"/>
+ </preGoal>
+
+ <goal name="torque-gen:prepare">
+ <property file="project.properties" />
+
+ <copy todir="${torque.schema.dir}">
+ <fileset dir="schema">
+ <include name="*" />
+ </fileset>
+ <filterset>
+ <filter token="DATABASE_DEFAULT" value="${torque.project}"/>
+ </filterset>
+ </copy>
+ </goal>
+
+</project>
Modified: jakarta/turbine/fulcrum/trunk/security/torque/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/project.properties Fri May 4 23:58:06 2007
@@ -1,154 +1,155 @@
-# -------------------------------------------------------------------
-# Copyright 2001-2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -------------------------------------------------------------------
-maven.multiproject.type=jar
-maven.junit.usefile=true
-maven.junit.fork=true
-
-# -------------------------------------------------------------------
-#
-# T O R Q U E C O N F I G U R A T I O N F I L E
-#
-# $Id: project.properties,v 1.1 2005/09/09 12:09:49 tvan Exp $
-#
-# -------------------------------------------------------------------
-# This file contains the most commonly used properties. For a
-# a complete list of build properties, please refer to:
-# http://jakarta.apache.org/turbine/torque/properties-reference.xml
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-#
-# P R O J E C T
-#
-# -------------------------------------------------------------------
-# This is the name of your Torque project. Your non-Java generated
-# files will be named using the project name selected below. If your
-# project=killerapp then you will have a generated:
-#
-# killerapp-schema.sql
-#
-# The custom is then to also rename your project XML schema from
-# project-schema.xml to killerapp-schema.xml. This is required
-# for a few targets such as datasql, datadump, and datadtd.
-# -------------------------------------------------------------------
-
-torque.project = fulcrum
-
-
-# -------------------------------------------------------------------
-#
-# T A R G E T D A T A B A S E
-#
-# -------------------------------------------------------------------
-# This is the target database, only considered when generating
-# the SQL for your Torque project. Your possible choices are:
-#
-# axion, cloudscape, db2, db2400, hypersonic, interbase, mssql,
-# mysql, oracle, postgresql, sapdb, sybase
-# -------------------------------------------------------------------
-
-torque.database = hypersonic
-
-
-# -------------------------------------------------------------------
-#
-# O B J E C T M O D E L I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addGetByNameMethod
-# If true, Torque adds methods to get database fields by name/position.
-#
-# addIntakeRetrievable
-# If true, the data objects will implement Intake's Retrievable
-# interface
-#
-# addSaveMethod
-# If true, Torque adds tracking code to determine how to save objects.
-#
-# addTimeStamp
-# If true, Torque true puts time stamps in generated om files.
-#
-# basePrefix
-# A string to pre-pend to the file names of base data and peer objects.
-#
-# complexObjectModel
-# If true, Torque generates data objects with collection support and
-# methods to easily retreive foreign key relationships.
-#
-# targetPackage
-# Sets the Java package the om files will generated to, e.g.
-# "com.company.project.om".
-#
-# useClasspath
-# If true, Torque will not look in the <code>templatePath</code> directory,
-# for templates, but instead load them from the classpath, allowing you to
-# use Torque without extracted it from the jar.
-#
-# useManagers
-# If true, Torque will generate Manager classes that use JCS for caching.
-# Still considered experimental.
-#
-# objectIsCaching
-# If true, Torque generates data objects that cache their foreign
-# key relationships. If this is not desired (because the underlying objects
-# can be manipulated from other code), set this property to false. This currently
-# cannot combined with the manager setting from above.
-# -------------------------------------------------------------------
-
-torque.targetPackage = org.apache.fulcrum.security.torque.om
-torque.useClasspath = true
-
-torque.output.dir = ./target
-torque.schema.dir = ${torque.output.dir}/schema
-
-torque.addGetByNameMethod = false
-torque.addIntakeRetrievable = false
-torque.addSaveMethod = true
-torque.addTimeStamp = true
-torque.basePrefix = Base
-torque.complexObjectModel = true
-torque.correctGetters = true
-torque.useManagers = false
-torque.objectIsCaching = true
-torque.saveException = TorqueException
-
-# -------------------------------------------------------------------
-#
-# D A T A B A S E S E T T I N G S
-#
-# -------------------------------------------------------------------
-# JDBC connection settings. This is used by the JDBCToXML task that
-# will create an XML database schema from JDBC metadata. These
-# settings are also used by the SQL Ant task to initialize your
-# Torque system with the generated SQL.
-#
-# sameJavaName
-# If true, the JDBC task will set the javaName attribute for the tables
-# and columns to be the same as SQL name.
-# -------------------------------------------------------------------
-
-torque.database.driver = org.hsqldb.jdbcDriver
-torque.database.createUrl = jdbc:hsqldb:.
-torque.database.buildUrl = jdbc:hsqldb:.
-torque.database.url = jdbc:hsqldb:.
-torque.database.user = sa
-torque.database.password =
-torque.database.host = .
-
-torque.sameJavaName = false
+# 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
+
+# -------------------------------------------------------------------
+#
+# T O R Q U E C O N F I G U R A T I O N F I L E
+#
+# $Id: project.properties,v 1.1 2005/09/09 12:09:49 tvan Exp $
+#
+# -------------------------------------------------------------------
+# This file contains the most commonly used properties. For a
+# a complete list of build properties, please refer to:
+# http://jakarta.apache.org/turbine/torque/properties-reference.xml
+# -------------------------------------------------------------------
+
+# -------------------------------------------------------------------
+#
+# P R O J E C T
+#
+# -------------------------------------------------------------------
+# This is the name of your Torque project. Your non-Java generated
+# files will be named using the project name selected below. If your
+# project=killerapp then you will have a generated:
+#
+# killerapp-schema.sql
+#
+# The custom is then to also rename your project XML schema from
+# project-schema.xml to killerapp-schema.xml. This is required
+# for a few targets such as datasql, datadump, and datadtd.
+# -------------------------------------------------------------------
+
+torque.project = fulcrum
+
+
+# -------------------------------------------------------------------
+#
+# T A R G E T D A T A B A S E
+#
+# -------------------------------------------------------------------
+# This is the target database, only considered when generating
+# the SQL for your Torque project. Your possible choices are:
+#
+# axion, cloudscape, db2, db2400, hypersonic, interbase, mssql,
+# mysql, oracle, postgresql, sapdb, sybase
+# -------------------------------------------------------------------
+
+torque.database = hypersonic
+
+
+# -------------------------------------------------------------------
+#
+# O B J E C T M O D E L I N F O R M A T I O N
+#
+# -------------------------------------------------------------------
+# These settings will allow you to customize the way your
+# Peer-based object model is created.
+# -------------------------------------------------------------------
+# addGetByNameMethod
+# If true, Torque adds methods to get database fields by name/position.
+#
+# addIntakeRetrievable
+# If true, the data objects will implement Intake's Retrievable
+# interface
+#
+# addSaveMethod
+# If true, Torque adds tracking code to determine how to save objects.
+#
+# addTimeStamp
+# If true, Torque true puts time stamps in generated om files.
+#
+# basePrefix
+# A string to pre-pend to the file names of base data and peer objects.
+#
+# complexObjectModel
+# If true, Torque generates data objects with collection support and
+# methods to easily retreive foreign key relationships.
+#
+# targetPackage
+# Sets the Java package the om files will generated to, e.g.
+# "com.company.project.om".
+#
+# useClasspath
+# If true, Torque will not look in the <code>templatePath</code> directory,
+# for templates, but instead load them from the classpath, allowing you to
+# use Torque without extracted it from the jar.
+#
+# useManagers
+# If true, Torque will generate Manager classes that use JCS for caching.
+# Still considered experimental.
+#
+# objectIsCaching
+# If true, Torque generates data objects that cache their foreign
+# key relationships. If this is not desired (because the underlying objects
+# can be manipulated from other code), set this property to false. This currently
+# cannot combined with the manager setting from above.
+# -------------------------------------------------------------------
+
+torque.targetPackage = org.apache.fulcrum.security.torque.om
+torque.useClasspath = true
+
+torque.output.dir = ./target
+torque.schema.dir = ${torque.output.dir}/schema
+
+torque.addGetByNameMethod = false
+torque.addIntakeRetrievable = false
+torque.addSaveMethod = true
+torque.addTimeStamp = true
+torque.basePrefix = Base
+torque.complexObjectModel = true
+torque.correctGetters = true
+torque.useManagers = false
+torque.objectIsCaching = true
+torque.saveException = TorqueException
+
+# -------------------------------------------------------------------
+#
+# D A T A B A S E S E T T I N G S
+#
+# -------------------------------------------------------------------
+# JDBC connection settings. This is used by the JDBCToXML task that
+# will create an XML database schema from JDBC metadata. These
+# settings are also used by the SQL Ant task to initialize your
+# Torque system with the generated SQL.
+#
+# sameJavaName
+# If true, the JDBC task will set the javaName attribute for the tables
+# and columns to be the same as SQL name.
+# -------------------------------------------------------------------
+
+torque.database.driver = org.hsqldb.jdbcDriver
+torque.database.createUrl = jdbc:hsqldb:.
+torque.database.buildUrl = jdbc:hsqldb:.
+torque.database.url = jdbc:hsqldb:.
+torque.database.user = sa
+torque.database.password =
+torque.database.host = .
+
+torque.sameJavaName = false
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org