You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/06 11:59:32 UTC

svn commit: r1310268 [16/42] - in /archiva/redback/redback-core/trunk: ./ redback-authentication/ redback-authentication/redback-authentication-api/ redback-authentication/redback-authentication-api/src/ redback-authentication/redback-authentication-ap...

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/DefaultServicesAssert.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/DefaultServicesAssert.java?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/DefaultServicesAssert.java (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/DefaultServicesAssert.java Fri Apr  6 09:58:14 2012
@@ -0,0 +1,51 @@
+package org.codehaus.redback.rest.services.mock;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import javax.inject.Inject;
+import javax.mail.internet.MimeMessage;
+import javax.ws.rs.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * a rest which contains some methods to do some assert
+ *
+ * @author Olivier Lamy
+ */
+public class DefaultServicesAssert
+    implements ServicesAssert
+{
+
+    @Inject
+    MockJavaMailSender mockJavaMailSender;
+
+    public List<EmailMessage> getEmailMessageSended()
+        throws Exception
+    {
+        List<EmailMessage> emailMessages = new ArrayList<EmailMessage>();
+        for ( MimeMessage mimeMessage : mockJavaMailSender.getSendedEmails() )
+        {
+            emailMessages.add( new EmailMessage( mimeMessage ) );
+        }
+        return emailMessages;
+    }
+
+
+}

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/DefaultServicesAssert.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/DefaultServicesAssert.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/EmailMessage.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/EmailMessage.java?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/EmailMessage.java (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/EmailMessage.java Fri Apr  6 09:58:14 2012
@@ -0,0 +1,113 @@
+package org.codehaus.redback.rest.services.mock;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import javax.mail.Address;
+import javax.mail.Message;
+import javax.mail.internet.MimeMessage;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Olivier Lamy
+ */
+@XmlRootElement( name = "emailMessage" )
+public class EmailMessage
+    implements Serializable
+{
+    private List<String> tos = new ArrayList<String>();
+
+    private String from;
+
+    private String subject;
+
+    private String text;
+
+    public EmailMessage()
+    {
+        // no op
+    }
+
+    public EmailMessage( MimeMessage mimeMessage )
+        throws Exception
+    {
+        this.from = mimeMessage.getFrom()[0].toString();
+        for ( Address address : mimeMessage.getRecipients( Message.RecipientType.TO ) )
+        {
+            tos.add( address.toString() );
+        }
+        this.setSubject( mimeMessage.getSubject() );
+        this.text = (String) mimeMessage.getContent();
+    }
+
+    public List<String> getTos()
+    {
+        return tos;
+    }
+
+    public void setTos( List<String> tos )
+    {
+        this.tos = tos;
+    }
+
+    public String getFrom()
+    {
+        return from;
+    }
+
+    public void setFrom( String from )
+    {
+        this.from = from;
+    }
+
+    public String getSubject()
+    {
+        return subject;
+    }
+
+    public void setSubject( String subject )
+    {
+        this.subject = subject;
+    }
+
+    public String getText()
+    {
+        return text;
+    }
+
+    public void setText( String text )
+    {
+        this.text = text;
+    }
+
+    @Override
+    public String toString()
+    {
+        final StringBuilder sb = new StringBuilder();
+        sb.append( "EmailMessage" );
+        sb.append( "{tos=" ).append( tos );
+        sb.append( ", from='" ).append( from ).append( '\'' );
+        sb.append( ", subject='" ).append( subject ).append( '\'' );
+        sb.append( ", text='" ).append( text ).append( '\'' );
+        sb.append( '}' );
+        return sb.toString();
+    }
+}

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/EmailMessage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/EmailMessage.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/MockJavaMailSender.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/MockJavaMailSender.java?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/MockJavaMailSender.java (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/MockJavaMailSender.java Fri Apr  6 09:58:14 2012
@@ -0,0 +1,64 @@
+package org.codehaus.redback.rest.services.mock;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.springframework.mail.MailException;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.springframework.stereotype.Service;
+
+import javax.mail.internet.MimeMessage;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:olamy@apache.org">olamy</a>
+ * @since 26 sept. 2008
+ * @version $Id$
+ */
+@Service("mockJavaMailSender")
+public class MockJavaMailSender
+    extends JavaMailSenderImpl
+    implements JavaMailSender
+{
+
+    List<MimeMessage> sendedEmails = new ArrayList<MimeMessage>();
+    
+    /**
+     * 
+     */
+    public MockJavaMailSender()
+    {
+      // no op
+    }
+
+    @Override
+    public void send( MimeMessage mimeMessage )
+        throws MailException
+    {
+        sendedEmails.add( mimeMessage );
+    }
+    
+    public List<MimeMessage> getSendedEmails()
+    {
+        return sendedEmails;
+    }
+
+}

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/MockJavaMailSender.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/MockJavaMailSender.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/ServicesAssert.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/ServicesAssert.java?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/ServicesAssert.java (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/ServicesAssert.java Fri Apr  6 09:58:14 2012
@@ -0,0 +1,37 @@
+package org.codehaus.redback.rest.services.mock;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+/**
+ * @author Olivier Lamy
+ */
+@Path( "DefaultServicesAssert" )
+public interface ServicesAssert
+{
+    @GET
+    @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
+    List<EmailMessage> getEmailMessageSended()
+        throws Exception;
+}

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/ServicesAssert.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/mock/ServicesAssert.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/redback/redback.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/redback/redback.xml?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/redback/redback.xml (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/redback/redback.xml Fri Apr  6 09:58:14 2012
@@ -0,0 +1,311 @@
+<!--
+  ~ 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.
+  -->
+<redback-role-model>
+  <modelVersion>1.0.0</modelVersion>
+  <applications>
+    <application>
+      <id>Archiva</id>
+      <version>1.0</version>
+      <operations>
+        <operation>
+          <id>archiva-manage-users</id>
+          <name>archiva-manage-users</name>
+          <description>Manage Archiva Users</description>
+        </operation>
+        <operation>
+          <id>archiva-manage-configuration</id>
+          <name>archiva-manage-configuration</name>
+          <description>Manage Archiva Configuration</description>
+        </operation>
+        <operation>
+          <id>archiva-regenerate-index</id>
+          <name>archiva-regenerate-index</name>
+          <description>Regenerate Archiva Index</description>
+        </operation>
+        <operation>
+          <id>archiva-run-indexer</id>
+          <name>archiva-run-indexer</name>
+          <description>Run Archiva Indexer</description>
+        </operation>
+        <operation>
+          <id>archiva-merge-repository</id>
+          <name>archiva-merge-repository</name>
+          <description>Archiva Merge Repository</description>
+        </operation>
+         <operation>
+          <id>archiva-delete-artifact</id>
+          <name>archiva-delete-artifact</name>
+          <description>Delete Artifact</description>
+        </operation>
+        <operation>
+          <id>archiva-access-reports</id>
+          <name>archiva-access-reports</name>
+          <description>Access Archiva Reports</description>
+        </operation>
+        <operation>
+          <id>archiva-add-repository</id>
+          <name>archiva-add-repository</name>
+          <description>Add Archiva Repository</description>
+        </operation>
+        <operation>
+          <id>archiva-delete-repository</id>
+          <name>archiva-delete-repository</name>
+          <description>Delete Archiva Repository</description>
+        </operation>
+        <operation>
+          <id>archiva-read-repository</id>
+          <name>archiva-read-repository</name>
+          <description>Read Archiva Repository</description>
+        </operation>
+        <operation>
+          <id>archiva-edit-repository</id>
+          <name>archiva-edit-repository</name>
+          <description>Edit Archiva Repository</description>
+        </operation>
+        <operation>
+          <id>archiva-upload-repository</id>
+          <name>archiva-upload-repository</name>
+          <description>Upload Archiva Repository</description>
+        </operation>
+        <operation>
+          <id>archiva-access-repository</id>
+          <name>archiva-access-repository</name>
+          <description>Access Archiva Repository</description>
+        </operation>
+        <operation>
+          <id>archiva-add-metadata</id>
+          <name>archiva-add-metadata</name>
+          <description>Add Repository Metadata</description>
+        </operation>
+        <operation>
+          <id>archiva-delete-metadata</id>
+          <name>archiva-delete-metadata</name>
+          <description>Delete Repository Metadata</description>
+        </operation>
+        <operation>
+          <id>archiva-view-audit-logs</id>
+          <name>archiva-view-audit-logs</name>
+          <description>View Archiva Audit Logs</description>
+        </operation>
+        <operation>
+          <id>archiva-guest</id>
+          <name>archiva-guest</name>
+          <description>Active Archiva Guest</description>
+        </operation>
+      </operations>
+      <roles>
+        <role>
+          <id>archiva-system-administrator</id>
+          <name>Archiva System Administrator</name>
+          <permanent>true</permanent>
+          <assignable>false</assignable>
+          <permissions>
+            <permission>
+              <id>archiva-manage-configuration</id>
+              <name>archiva-manage-configuration</name>
+              <operation>archiva-manage-configuration</operation>
+              <resource>global</resource>
+              <permanent>true</permanent>
+            </permission>
+            <permission>
+              <id>archiva-manage-users</id>
+              <name>archiva-manage-users</name>
+              <operation>archiva-manage-users</operation>
+              <resource>global</resource>
+              <permanent>true</permanent>
+            </permission>
+            <permission>
+              <id>archiva-run-indexer</id>
+              <name>archiva-run-indexer</name>
+              <operation>archiva-run-indexer</operation>
+              <resource>global</resource>
+              <permanent>true</permanent>
+            </permission>
+            <permission>
+              <id>archiva-regenerate-index</id>
+              <name>archiva-regenerate-index</name>
+              <operation>archiva-regenerate-index</operation>
+              <resource>global</resource>
+              <permanent>true</permanent>
+            </permission>
+            <permission>
+              <id>archiva-access-reports</id>
+              <name>archiva-access-reports</name>
+              <operation>archiva-access-reports</operation>
+              <resource>global</resource>
+              <permanent>true</permanent>
+            </permission>
+          </permissions>
+          <childRoles>
+            <childRole>archiva-global-repository-manager</childRole>
+          </childRoles>
+          <parentRoles>
+            <parentRole>system-administrator</parentRole>
+          </parentRoles>
+        </role>
+        <role>
+          <id>archiva-user-administrator</id>
+          <name>Archiva User Administrator</name>
+          <permanent>true</permanent>
+          <assignable>false</assignable>
+          <permissions>
+            <permission>
+              <id>archiva-guest</id>
+              <name>Archiva Guest Permission</name>
+              <operation>archiva-guest</operation>
+              <resource>global</resource>
+              <permanent>true</permanent>
+            </permission>
+            <permission>
+              <id>archiva-manage-users</id>
+              <name>archiva-manage-users</name>
+              <operation>archiva-manage-users</operation>
+              <resource>global</resource>
+              <permanent>true</permanent>
+            </permission>
+          </permissions>
+          <parentRoles>
+            <parentRole>user-administrator</parentRole>
+          </parentRoles>
+        </role>
+        <role>
+          <id>archiva-guest</id>
+          <name>Archiva Guest</name>
+          <permanent>true</permanent>
+          <assignable>false</assignable>
+          <permissions>
+            <permission>
+              <id>archiva-guest</id>
+              <name>Archiva Guest Permission</name>
+              <operation>archiva-guest</operation>
+              <resource>global</resource>
+              <permanent>true</permanent>
+            </permission>
+          </permissions>
+          <parentRoles>
+            <parentRole>guest</parentRole>
+          </parentRoles>
+        </role>
+        <role>
+          <id>archiva-global-repository-manager</id>
+          <name>Global Repository Manager</name>
+          <permanent>true</permanent>
+          <assignable>true</assignable>
+          <permissions>
+            <permission>
+              <id>archiva-add-repository</id>
+              <name>Archiva Add Repository</name>
+              <operation>archiva-add-repository</operation>
+              <resource>global</resource>
+              <permanent>true</permanent>
+            </permission>
+          </permissions>
+          <childRoles>
+            <childRole>archiva-global-repository-observer</childRole>
+          </childRoles>
+        </role>
+        <role>
+          <id>archiva-global-repository-observer</id>
+          <name>Global Repository Observer</name>
+          <permanent>true</permanent>
+          <assignable>true</assignable>
+        </role>
+      </roles>
+      <templates>
+        <template>
+          <id>archiva-repository-manager</id>
+          <namePrefix>Repository Manager</namePrefix>
+          <assignable>true</assignable>
+          <permissions>
+             <permission>
+              <id>archiva-delete-artifact</id>
+              <name>Delete Artifact</name>
+              <operation>archiva-delete-artifact</operation>
+              <resource>${resource}</resource>
+            </permission>
+            <permission>
+              <id>archiva-edit-repository</id>
+              <name>Archiva Edit Repository</name>
+              <operation>archiva-edit-repository</operation>
+              <resource>${resource}</resource>
+            </permission>
+            <permission>
+              <id>archiva-delete-repository</id>
+              <name>Archiva Delete Repository</name>
+              <operation>archiva-delete-repository</operation>
+              <resource>${resource}</resource>
+            </permission>
+            <permission>
+              <id>archiva-upload-repository</id>
+              <name>Archiva Upload to Repository</name>
+              <operation>archiva-upload-repository</operation>
+              <resource>${resource}</resource>
+            </permission>
+            <permission>
+              <id>archiva-view-audit-logs</id>
+              <name>Archiva View Audit Logs</name>
+              <operation>archiva-view-audit-logs</operation>
+              <resource>${resource}</resource>
+            </permission>
+            <permission>
+              <id>archiva-add-metadata</id>
+              <name>Archiva Add Repository Metadata</name>
+              <operation>archiva-add-metadata</operation>
+              <resource>${resource}</resource>
+            </permission>
+            <permission>
+              <id>archiva-delete-metadata</id>
+              <name>Archiva Delete Repository Metadata</name>
+              <operation>archiva-delete-metadata</operation>
+              <resource>${resource}</resource>
+            </permission>
+            <permission>
+              <id>archiva-merge-repository</id>
+              <name>Archiva Merge Repository</name>
+              <operation>archiva-merge-repository</operation>
+              <resource>${resource}</resource>
+            </permission>
+          </permissions>
+          <childTemplates>
+            <childTemplate>archiva-repository-observer</childTemplate>
+          </childTemplates>
+          <parentRoles>
+            <parentRole>archiva-global-repository-manager</parentRole>
+          </parentRoles>
+        </template>
+        <template>
+          <id>archiva-repository-observer</id>
+          <namePrefix>Repository Observer</namePrefix>
+          <assignable>true</assignable>
+          <permissions>
+            <permission>
+              <id>archiva-read-repository</id>
+              <name>Archiva Read Repository</name>
+              <operation>archiva-read-repository</operation>
+              <resource>${resource}</resource>
+            </permission>
+          </permissions>
+          <parentRoles>
+            <parentRole>archiva-global-repository-observer</parentRole>
+          </parentRoles>
+        </template>
+      </templates>
+    </application>
+  </applications>
+</redback-role-model>

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/redback/redback.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/redback/redback.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml Fri Apr  6 09:58:14 2012
@@ -0,0 +1,64 @@
+<?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.
+  -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+           http://www.springframework.org/schema/context 
+           http://www.springframework.org/schema/context/spring-context-3.0.xsd
+           http://cxf.apache.org/jaxrs
+           http://cxf.apache.org/schemas/jaxrs.xsd">
+
+  <import resource="classpath:META-INF/cxf/cxf.xml"/>
+  <!--
+  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/>
+  -->
+  <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
+
+
+  <jaxrs:server id="testServices" address="/fakeCreateAdminService">
+    <jaxrs:serviceBeans>
+      <ref bean="fakeCreateAdminService"/>
+    </jaxrs:serviceBeans>
+
+   </jaxrs:server>
+
+  <jaxrs:server id="services" address="/testsService">
+    <jaxrs:serviceBeans>
+      <ref bean="servicesAssert"/>
+    </jaxrs:serviceBeans>
+    <jaxrs:providers>
+      <bean class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>
+    </jaxrs:providers>
+
+   </jaxrs:server>
+
+  <bean name="fakeCreateAdminService" class="org.codehaus.redback.rest.services.FakeCreateAdminServiceImpl"/>
+
+  <bean name="mockJavaMailSender" class="org.codehaus.redback.rest.services.mock.MockJavaMailSender"/>
+
+  <alias name="mockJavaMailSender" alias="mailSender"/>
+
+  <bean name="servicesAssert" class="org.codehaus.redback.rest.services.mock.DefaultServicesAssert"/>
+
+</beans>
\ No newline at end of file

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j.xml?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j.xml (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j.xml Fri Apr  6 09:58:14 2012
@@ -0,0 +1,47 @@
+<?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.
+  -->
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+  <appender name="console" class="org.apache.log4j.ConsoleAppender">
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
+    </layout>
+  </appender>
+  <!--
+  <logger name="org.apache.cxf.jaxrs.interceptor.JAXRSInInterceptor">
+    <level value="trace"/>
+  </logger>
+  <logger name="org.apache.cxf.jaxrs.utils.JAXRSUtils">
+    <level value="trace"/>
+  </logger>
+  -->
+  <logger name="org.codehaus.redback.rest.services" >
+    <level value="debug"/>
+  </logger>
+
+  <root>
+    <priority value ="info" />
+    <appender-ref ref="console" />
+  </root>
+
+</log4j:configuration>

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/pom.xml?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/pom.xml (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/pom.xml Fri Apr  6 09:58:14 2012
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2006 The Codehaus.
+  ~ 
+  ~ 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.
+  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.codehaus.redback</groupId>
+    <artifactId>redback-integrations</artifactId>
+    <version>1.5-SNAPSHOT</version>
+  </parent>
+  <artifactId>redback-struts2</artifactId>
+  <name>Redback :: Integration :: Struts 2</name>
+  <packaging>pom</packaging>
+
+  <properties>
+    <struts.version>2.2.3.1</struts.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-spring-plugin</artifactId>
+        <version>${struts.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-core</artifactId>
+        <version>${struts.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-junit-plugin</artifactId>
+        <version>${struts.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.struts.xwork</groupId>
+        <artifactId>xwork-core</artifactId>
+        <version>${struts.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>ognl</groupId>
+        <artifactId>ognl</artifactId>
+        <version>3.0.2</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <modules>
+    <module>redback-struts2-integration</module>
+    <module>redback-struts2-content</module>
+    <module>redback-struts2-example</module>
+  </modules>
+
+</project>

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/pom.xml?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/pom.xml (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/pom.xml Fri Apr  6 09:58:14 2012
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2006 The Codehaus.
+  ~ 
+  ~ 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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.codehaus.redback</groupId>
+    <artifactId>redback-struts2</artifactId>
+    <version>1.5-SNAPSHOT</version>
+  </parent> 
+  <artifactId>redback-struts2-content</artifactId>
+  <name>Redback :: Integration :: Struts 2 Content War</name>
+  <packaging>war</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.redback</groupId>
+      <artifactId>redback-struts2-integration</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.redback</groupId>
+      <artifactId>redback-common-integrations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ognl</groupId>
+      <artifactId>ognl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jpox</groupId>
+      <artifactId>jpox</artifactId>
+      <scope>compile</scope>
+      <exclusions>
+        <!-- targeting JDK 1.4 we don't need this -->
+        <exclusion>
+          <groupId>javax.sql</groupId>
+          <artifactId>jdbc-stdext</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+
+        <exclusion>
+          <groupId>javax.resource</groupId>
+          <artifactId>connector</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.transaction</groupId>
+          <artifactId>jta</artifactId>
+        </exclusion>
+
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <warSourceExcludes>WEB-INF/lib/**</warSourceExcludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jspc-maven-plugin</artifactId>
+        <version>1.4.6</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <warSourceDirectory>${project.build.directory}/${project.build.finalName}/</warSourceDirectory>
+          <!--
+            Uncomment outputWebXml if you want the generated web.xml to
+            be placed in the working directory that the war:war mojo uses.
+            -->
+          <!--
+          <outputWebXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</outputWebXml>
+          -->
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/resources/struts-security.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/resources/struts-security.xml?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/resources/struts-security.xml (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/resources/struts-security.xml Fri Apr  6 09:58:14 2012
@@ -0,0 +1,330 @@
+<?xml version="1.0" ?>
+<!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/struts-2.0.dtd"> 
+
+<!-- ==================================================================
+     Plexus Security Tools
+
+     This should contain the /security namespaced action configurations.
+
+     These configurations will likely not need changing.
+
+     These configurations point to the overlaid jsp files.
+     ==================================================================  -->
+
+<struts>
+  <!-- ==================================================================
+       Security Tools for Users
+
+       All Users should be able to access and use the actions contained
+       within this package.
+       ==================================================================  -->
+
+  <package name="security" extends="struts-default" namespace="/security">
+    <result-types>
+      <result-type name="security-external" class="securityExternalResult" />
+    </result-types>
+
+    <interceptors>
+      <interceptor name="redbackForceAdminUser" class="redbackForceAdminUserInterceptor"/>
+      <interceptor name="redbackEnvCheck" class="redbackEnvironmentCheckInterceptor"/>
+      <interceptor name="redbackAutoLogin" class="redbackAutoLoginInterceptor"/>
+      <interceptor name="redbackPolicyEnforcement" class="redbackPolicyEnforcementInterceptor"/>
+      <interceptor name="redbackSecureActions" class="redbackSecureActionInterceptor"/>
+
+      <!--
+      Stacks are order dependent and fail silently by not running the referenced stack.
+      Make sure that redbackCommonStack remains above is usages.
+      -->
+      <interceptor-stack name="redbackCommonStack">
+         <interceptor-ref name="redbackEnvCheck"/>
+         <interceptor-ref name="redbackForceAdminUser"/>
+         <interceptor-ref name="redbackAutoLogin"/>
+         <interceptor-ref name="redbackPolicyEnforcement"/>
+         <interceptor-ref name="redbackSecureActions">
+           <param name="enableReferrerCheck">true</param>
+         </interceptor-ref>
+      </interceptor-stack>
+
+      <interceptor-stack name="securedStack">
+        <interceptor-ref name="defaultStack"/>
+        <interceptor-ref name="redbackCommonStack"/>
+        <interceptor-ref name="tokenSession">
+          <param name="excludeMethods">*</param>  
+        </interceptor-ref>
+      </interceptor-stack>
+      
+      <interceptor-stack name="securedPrepareParamsStack">
+        <interceptor-ref name="paramsPrepareParamsStack"/>
+        <interceptor-ref name="redbackCommonStack"/>
+      </interceptor-stack>
+
+    </interceptors>
+
+    <default-interceptor-ref name="securedStack"/>
+
+    <global-results>
+      <result name="security-admin-user-needed" type="redirectAction">
+        <param name="actionName">addadmin</param>
+        <param name="namespace">/security</param>
+      </result>
+      <result name="requires-authentication">/WEB-INF/jsp/redback/requiresAuthentication.jsp</result>
+      <result name="requires-authorization">/WEB-INF/jsp/redback/accessDenied.jsp</result>
+      <result name="security-must-change-password" type="redirectAction">
+        <param name="actionName">password</param>
+        <param name="namespace">/security</param>        
+      </result>
+      <result name="security-resend-validation-email" type="redirectAction">
+        <param name="actionName">userlist</param>
+        <param name="namespace">/security</param>        
+      </result>
+      <result name="invalid.token">/WEB-INF/jsp/redback/invalidToken.jsp</result>
+    </global-results>
+
+    <action name="login" class="redback-login" method="show">
+      <result name="input">/WEB-INF/jsp/redback/login.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/login.jsp</result>
+      <result name="security-login-success" type="security-external">
+        <param name="externalResult">security-login-success</param>
+      </result>
+      <result name="cancel" type="security-external">
+        <param name="externalResult">security-login-cancel</param>
+      </result>
+      <result name="security-login-locked" type="security-external">
+        <param name="externalResult">security-login-locked</param>
+      </result>
+    </action>
+
+    <action name="logout" class="redback-logout" method="logout">
+      <result name="security-logout" type="security-external">
+        <param name="externalResult">security-logout</param>
+      </result>
+    </action>
+
+    <action name="register" class="redback-register" method="show">
+      <result name="input">/WEB-INF/jsp/redback/register.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/register.jsp</result>
+      <result name="validation-note">/WEB-INF/jsp/redback/validationNotification.jsp</result>
+      <result name="security-register-success" type="security-external">
+        <param name="externalResult">security-register-success</param>
+      </result>
+      <result name="cancel" type="security-external">
+        <param name="externalResult">security-register-cancel</param>
+      </result>
+    </action>
+
+    <action name="account" class="redback-account" method="show">
+      <result name="input">/WEB-INF/jsp/redback/account.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/account.jsp</result>
+      <result name="security-account-success" type="security-external">
+        <param name="externalResult">security-account-success</param>
+      </result>
+      <result name="cancel" type="security-external">
+        <param name="externalResult">security-account-cancel</param>
+      </result>
+    </action>
+
+    <action name="password" class="redback-password" method="show">
+      <result name="input">/WEB-INF/jsp/redback/password.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/password.jsp</result>
+      <result name="security-login-success" type="security-external">
+        <param name="externalResult">security-login-success</param>
+      </result>
+      <result name="security-register-success" type="security-external">
+        <param name="externalResult">security-register-success</param>
+      </result>      
+      <result name="success" type="redirect">${targetUrl}</result>
+      <result name="cancel" type="redirectAction">
+        <param name="actionName">logout</param>
+        <param name="namespace">/security</param>
+      </result>
+      <result name="security-change-password-success">/WEB-INF/jsp/redback/changePasswordSuccess.jsp</result>
+    </action>
+
+    <action name="passwordReset" class="redback-password-reset" method="show">
+      <result name="input">/WEB-INF/jsp/redback/requestPasswordReset.jsp</result>
+      <result name="none">/WEB-INF/jsp/redback/login.jsp</result>
+    </action>
+
+    <action name="addadmin" class="redback-admin-account" method="show">
+      <interceptor-ref name="defaultStack"/>
+      <result name="input">/WEB-INF/jsp/redback/admin/createAdmin.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/admin/createAdmin.jsp</result>
+      <result name="login-error">/WEB-INF/jsp/redback/login.jsp</result>
+      <result name="security-login-success" type="security-external">
+        <param name="externalResult">security-login-success</param>
+      </result>
+      <result name="security-login-locked" type="security-external">
+        <param name="externalResult">security-login-locked</param>
+      </result>
+    </action>
+
+  <!-- ==================================================================
+       Security Tools for Administrators
+
+       Only Administrators should be able to access and use these actions
+       ==================================================================  -->
+
+    <action name="systeminfo" class="redback-sysinfo" method="show">
+      <result>/WEB-INF/jsp/redback/admin/systemInformation.jsp</result>
+    </action>
+
+    <action name="adminConsole" class="redback-admin-console" method="show">
+      <result>/WEB-INF/jsp/redback/admin/console.jsp</result>
+    </action>
+
+    <action name="report" class="redback-report" method="generate">
+      <result name="error" type="redirectAction">userlist</result>
+    </action>
+
+    <action name="userlist" class="redback-admin-user-list" method="show">
+      <result name="input">/WEB-INF/jsp/redback/admin/userList.jsp</result>
+      <result name="success">/WEB-INF/jsp/redback/admin/userList.jsp</result>
+    </action>
+
+    <action name="useredit" class="redback-admin-user-edit" method="edit">
+      <result name="input">/WEB-INF/jsp/redback/admin/userEdit.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/admin/userEdit.jsp</result>
+      <result name="confirm">/WEB-INF/jsp/redback/admin/confirmUserAdministrator.jsp</result>
+      <result name="confirmError">/WEB-INF/jsp/redback/admin/confirmUserAdministrator.jsp</result>
+      <result name="success" type="redirectAction">userlist</result>
+      <result name="cancel" type="redirectAction">userlist</result>
+    </action>
+
+    <action name="usercreate" class="redback-admin-user-create" method="show">
+      <result name="input">/WEB-INF/jsp/redback/admin/userCreate.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/admin/userCreate.jsp</result>
+      <result name="success" type="redirectAction">
+        <param name="actionName">assignments</param>
+        <param name="principal">${user.username}</param>
+      </result>
+      <interceptor-ref name="securedStack">
+        <param name="tokenSession.includeMethods">*</param>
+      </interceptor-ref>
+    </action>
+
+    <action name="userdelete" class="redback-admin-user-delete" method="confirm">
+      <result name="input">/WEB-INF/jsp/redback/admin/userDelete.jsp</result>
+      <result name="error" type="redirectAction">userlist</result>
+      <result name="success" type="redirectAction">userlist</result>
+      <result name="cancel" type="redirectAction">userlist</result>
+      <interceptor-ref name="securedStack">
+        <param name="tokenSession.includeMethods">*</param>
+      </interceptor-ref>
+    </action>
+
+    <!-- ==== RBAC Actions ========================================== -->
+
+    <!-- This action is meant to be embedded within the User Edit action output jsp.
+         It is injected using the <ww:action> taglib -->
+    <action name="assignments" class="redback-assignments" method="show">
+      <interceptor-ref name="securedStack"/>
+      <result name="input">/WEB-INF/jsp/redback/admin/assignments.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/include/error.jsp</result>
+      <result name="success">/WEB-INF/jsp/redback/admin/assignments.jsp</result>
+    </action>
+
+    <action name="addRolesToUser" class="redback-assignments" method="edituser">
+      <result name="success" type="redirectAction">userlist</result>
+      <interceptor-ref name="securedStack">
+        <param name="tokenSession.includeMethods">*</param>
+      </interceptor-ref>
+    </action>
+
+    <action name="removeRolesFromUser" class="redback-assignments" method="edituser">
+      <result name="success" type="redirectAction">userlist</result>
+    </action>
+
+    <action name="rolecreate" class="redback-role-create" method="show">
+      <result name="input">/WEB-INF/jsp/redback/admin/roleCreate.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/admin/roleCreate.jsp</result>
+      <result name="success" type="redirectAction">userlist</result>
+      <interceptor-ref name="securedStack">
+        <param name="tokenSession.includeMethods">*</param>
+      </interceptor-ref>
+    </action>
+
+    <action name="role" class="redback-role-edit" method="input">
+      <result name="input">/WEB-INF/jsp/redback/admin/role.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/admin/role.jsp</result>
+      <result name="success" type="redirectAction">roles</result>
+    </action>
+
+    <action name="roleedit" class="redback-role-edit" method="edit">
+      <result name="input">/WEB-INF/jsp/redback/admin/roleEdit.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/admin/roleEdit.jsp</result>
+      <result name="success" type="redirectAction">roles</result>
+    </action>
+
+    <action name="rolesave" class="redback-role-edit" method="save">
+      <result name="input">/WEB-INF/jsp/redback/admin/roleEdit.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/admin/roleEdit.jsp</result>
+      <result name="success" type="redirectAction">roles</result>
+      <interceptor-ref name="securedStack">
+        <param name="tokenSession.includeMethods">*</param>
+      </interceptor-ref>
+    </action>
+
+    <action name="roleusersadd" class="redback-role-edit" method="addUsers">
+      <result name="input">/WEB-INF/jsp/redback/admin/roleEdit.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/admin/roleEdit.jsp</result>
+      <result name="success">/WEB-INF/jsp/redback/admin/roleEdit.jsp</result>
+      <interceptor-ref name="securedStack">
+        <param name="tokenSession.includeMethods">*</param>
+      </interceptor-ref>
+    </action>
+
+    <action name="roleusersremove" class="redback-role-edit" method="removeUsers">
+      <result name="input">/WEB-INF/jsp/redback/admin/roleEdit.jsp</result>
+      <result name="error">/WEB-INF/jsp/redback/admin/roleEdit.jsp</result>
+      <result name="success">/WEB-INF/jsp/redback/admin/roleEdit.jsp</result>
+      <interceptor-ref name="securedStack">
+        <param name="tokenSession.includeMethods">*</param>
+      </interceptor-ref>
+    </action>
+
+    <action name="roleSummary" class="redback-roles" method="list">
+       <result name="list">/WEB-INF/jsp/redback/admin/roleSummary.jsp</result>
+    </action>
+
+    <action name="roles" class="redback-roles" method="list">
+      <result name="list">/WEB-INF/jsp/redback/admin/roleList.jsp</result>
+    </action>
+
+    <action name="permissions" class="redback-permissions" method="list">
+      <result name="list">/WEB-INF/jsp/redback/admin/permissionList.jsp</result>
+    </action>
+
+    <action name="operations" class="redback-operations" method="list">
+      <result name="list">/WEB-INF/jsp/redback/admin/operationList.jsp</result>
+    </action>
+
+    <action name="resources" class="redback-resources" method="list">
+      <result name="list">/WEB-INF/jsp/redback/admin/resourceList.jsp</result>
+    </action>
+
+    <action name="roleModel" class="redback-role-model" method="view">
+      <result name="success">/WEB-INF/jsp/redback/admin/roleModel.jsp</result>
+    </action>
+
+    <!--
+      Backup Restore actions 
+     -->
+
+    <action name="backupRestore" class="backup-restore" method="view">
+      <result>/WEB-INF/jsp/redback/admin/backupRestore.jsp</result>
+    </action>
+       
+    <action name="backup" class="backup-restore" method="backup">
+      <result name="custom_error">/WEB-INF/jsp/redback/admin/backupRestore.jsp</result>
+      <result type="redirectAction">backupRestore</result>
+    </action>
+
+    <action name="restore" class="backup-restore" method="restore">
+      <result name="custom_error">/WEB-INF/jsp/redback/admin/backupRestore.jsp</result>      
+      <result name="success" type="redirectAction">backupRestore</result>
+    </action>
+    
+  </package>
+
+</struts>

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/resources/struts-security.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/resources/struts-security.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/accessDenied.jsp
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/accessDenied.jsp?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/accessDenied.jsp (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/accessDenied.jsp Fri Apr  6 09:58:14 2012
@@ -0,0 +1,46 @@
+<%--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  --%>
+
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+<s:i18n name="org.codehaus.plexus.redback.struts2.default">
+<head>
+  <title><s:text name="access.denied.page.title"/></title>
+</head>
+
+<body>
+
+<h4><s:text name="access.denied.section.title"/></h4>
+
+<div id="results">
+  <%-- This is where the "Account Created Successfully" type message goes. --%>
+  <div class="success">
+    <s:actionmessage />
+  </div>
+  <%-- This is where errors from the action and other non-form field specific errors appear. --%>
+  <div class="errors">
+    <s:actionerror />
+  </div>
+</div>
+
+<p>
+  <s:text name="access.denied.message"/>
+</p>
+
+</body>
+</s:i18n>
+</html>

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/accessDenied.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/accessDenied.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/account.jsp
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/account.jsp?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/account.jsp (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/account.jsp Fri Apr  6 09:58:14 2012
@@ -0,0 +1,47 @@
+<%--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  --%>
+
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="redback" uri="/redback/taglib-1.0"%>
+
+<html>
+<s:i18n name="org.codehaus.plexus.redback.struts2.default">
+<head>
+  <title><s:text name="account.details.page.title"/></title>
+</head>
+
+<body>
+
+<%@ include file="/WEB-INF/jsp/redback/include/formValidationResults.jsp" %>
+
+<h2><s:text name="account.details.section.title"/></h2>
+   
+<s:form action="account" namespace="/security" theme="xhtml"
+         id="registerForm" method="post" name="register" cssClass="security register">     
+  <%@ include file="/WEB-INF/jsp/redback/include/userCredentials.jsp" %>
+  <redback:isReadOnlyUserManager>
+  	<s:submit value="%{getText('goback')}" method="cancel" />
+  </redback:isReadOnlyUserManager>
+  <redback:isNotReadOnlyUserManager>
+    <s:submit value="%{getText('submit')}" method="submit" />
+    <s:submit value="%{getText('cancel')}" method="cancel" />
+  </redback:isNotReadOnlyUserManager>
+</s:form>
+
+</body>
+</s:i18n>
+</html>

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/account.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/account.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/adminConsole.jsp
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/adminConsole.jsp?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/adminConsole.jsp (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/adminConsole.jsp Fri Apr  6 09:58:14 2012
@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+
+</body>
+</html>

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/adminConsole.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/adminConsole.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/assignments.jsp
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/assignments.jsp?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/assignments.jsp (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/assignments.jsp Fri Apr  6 09:58:14 2012
@@ -0,0 +1,177 @@
+<%--
+  ~ Copyright 2005-2006 The Codehaus.
+  ~
+  ~ 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.
+  --%>
+
+<%@ taglib prefix="s" uri="/struts-tags"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+
+<html>
+<s:i18n name="org.codehaus.plexus.redback.struts2.default">
+<head>
+  <title><s:text name="assignments.page.title"/></title>
+</head>
+
+<body>
+
+<h2><s:text name="assignments.section.title"/></h2>
+
+    <div class="axial">
+      <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <s:label label="%{getText('username')}" name="principal"/>
+        <s:label label="%{getText('full.name')}" name="user.fullName"/>
+        <s:label label="%{getText('email')}" name="user.email"/>
+      </table>
+    </div>
+
+<!--<h3><s:text name="assignments.available.roles"/></h3>-->
+
+    <s:form action="addRolesToUser" namespace="/security" name="addRoles">
+      <s:hidden name="principal"/>
+      <s:hidden name="addRolesButton" value="true"/>
+      <s:token/>
+
+      <s:iterator id="application" value="applicationRoleDetails">
+
+        <h3><c:out value="${application.name}" /></h3>
+        <c:if test="${!empty application.description}">
+          <p><i><c:out value="${application.description}" /></i></p>
+        </c:if>
+
+        <c:if test="${!empty assignedRoles}">
+
+         <h5><s:text name="assignments.assigned.roles"/></h5>
+         <table>
+         <s:iterator id="assignedRole" value="assignedRoles">
+           <s:checkbox label="%{assignedRole}" name="addNDSelectedRoles" fieldValue="%{assignedRole}"/>
+         </s:iterator>
+         </table>
+
+        </c:if>
+        <c:if test="${!empty availableRoles}">
+          <h5><s:text name="assignments.available.roles"/></h5>
+          <table>
+          <s:iterator id="availableRole" value="availableRoles">
+            <s:checkbox label="%{availableRole}" name="addNDSelectedRoles" value="false" fieldValue="%{availableRole}"/>
+          </s:iterator>
+          </table>
+        </c:if>
+
+        <c:if test="${!empty table}">
+          <h5><s:text name="assignments.resource.roles"/></h5>
+          <table>
+            <tr>
+              <td></td>
+              <s:iterator id="column" value="tableHeader">
+                <td>${column.namePrefix}</td>
+              </s:iterator>
+            </tr>
+
+            <c:forEach var="row" items="${table}">
+              <tr>
+                <c:forEach var="column" items="${row}">
+
+                  <c:choose>
+                    <c:when test="${column.label}">
+                      <td>${column.name}</td>
+                    </c:when>
+                    <c:when test="${column.assigned}">
+                      <td>
+                        <center>
+                          <input type="checkbox" name="addDSelectedRoles" value="${column.name}" checked="checked"/>
+                        </center>
+                      </td>
+                    </c:when>
+                    <c:when test="${column.effectivelyAssigned}">
+                      <td>
+                        <center>
+                          <input type="checkbox" name="addDSelectedRoles" value="${column.name}" disabled="disabled"/>
+                        </center>
+                      </td>
+                    </c:when>
+                    <c:otherwise>
+                      <td>
+                        <center>
+                          <input type="checkbox" name="addDSelectedRoles" value="${column.name}"/>
+                        </center>
+                      </td>
+                     </c:otherwise>
+                   </c:choose>
+
+                </c:forEach>
+              </tr>
+            </c:forEach>
+          </table>
+        </c:if>
+      </s:iterator>
+   <%--
+      <h4>Global Roles</h4>
+      <s:checkboxlist list="nondynamicroles" name="addNDSelectedRoles" value="NDRoles" theme="redback"/>
+      <br/>
+
+      <h4>Resource Roles</h4>
+      <c:choose>
+        <c:when test="${!empty dynamicroles}">
+          <c:set var="numtemplates" value="0"/>
+          <table border="1">
+           <tr>
+             <td>&nbsp</td>
+             <s:iterator id="template" value="templates">
+      	       <td>${template.namePrefix}</td>
+      	       <c:set var="numtemplates" value="${numtemplates + 1}"/>
+              </s:iterator>
+           </tr>
+           <tr>
+             <c:set var="count" value="0"/>
+             <s:iterator id="dynamicrole" value="dynamicroles" status="row_status">
+               <c:if test="${count == 0}">
+                 <td>${dynamicrole.resource}</td>
+               </c:if>
+               <c:set var="chkbx" value="<input type='checkbox' name='addDSelectedRoles' value='${dynamicrole.name}'/>"/>
+               <s:iterator id="drole" value="DRoles">
+                 <c:if test="${(drole == dynamicrole.name)}">
+                   <c:set var="chkbx" value="<input type='checkbox' name='addDSelectedRoles' value='${dynamicrole.name}' checked='yes'/>"/>
+                 </c:if>
+               </s:iterator>
+               <td><center>${chkbx}</center></td>
+               <c:set var="count" value="${count + 1}"/>
+               <c:if test="${count == numtemplates}">
+                 <c:choose>
+                   <c:when test="${row_status.last}">
+                     </tr>
+                   </c:when>
+                   <c:otherwise>
+                     </tr><tr>
+                   </c:otherwise>
+                 </c:choose>
+                 <c:set var="count" value="0"/>
+               </c:if>
+             </s:iterator>
+          </table>
+        </c:when>
+        <c:otherwise>
+          <p><em><s:text name="assignments.no.roles.to.grant"/></em></p>
+        </c:otherwise>
+      </c:choose>
+--%>
+      <br/>
+      <s:submit value="%{getText('assignments.submit')}" name="submitRolesButton" theme="simple" />
+      <br/>
+      <s:reset type="button" value="%{getText('assignments.reset')}" name="resetRolesButton" theme="simple" />
+    </s:form>
+
+</body>
+</s:i18n>
+</html>

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/assignments.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/assignments.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/backupRestore.jsp
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/backupRestore.jsp?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/backupRestore.jsp (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/backupRestore.jsp Fri Apr  6 09:58:14 2012
@@ -0,0 +1,95 @@
+<%@ taglib uri="/struts-tags" prefix="s"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<html>
+<s:i18n name="org.codehaus.plexus.redback.struts2.default">
+  <head>
+    <title><s:text name="backupRestore.page.title"/></title>
+  </head>
+  <body>
+    <div id="h3">
+      <h3><s:text name="backupRestore.section.backup.title"/></h3>
+
+      <c:if test="${!empty actionErrors}">
+        <div class="errormessage">
+          <s:iterator value="actionErrors">
+            <p><s:text name="<s:property/>" /></p>
+          </s:iterator>          
+        </div>
+      </c:if>
+
+      <p>
+        You can back up the application data for this installation to prevent data loss in the case of system failures. 
+        The  application will be inaccessible while the backup takes place.
+      </p>
+      <p>
+        A backup will be stored on the server in a dated subdirectory of the backup directory: 
+        <code> 
+          <s:property value="backupDirectory" /> 
+        </code> 
+      </p>
+
+      <s:form action="backup" method="post" >
+        <s:submit value="Create Backup" theme="simple"/>
+      </s:form>  
+    </div>
+ 
+    <div id="h3">  
+      <h3><s:text name="backupRestore.section.restore.title"/></h3>
+      <p>
+        You can reset the system to a previous state by using the
+        restore function, or use it to import data from another version of this application.
+      </p>
+      <p>
+        You can specify the directory where the backup files are located, or select from one of the recent backups in the configured
+        backup directory.
+      </p>
+
+      <s:form action="restore" method="post" validate="true">
+        <table>
+          <s:textfield name="restoreDirectory" label="Backup directory"
+            size="70" required="true" />
+          <s:submit value="Restore Backup" theme="simple" />
+        </table>         
+      </s:form>
+    </div>
+    
+    <div id="h3">
+      <h4><s:text name="backupRestore.section.recent.backup"/></h4>
+
+      <s:set name="previousBackups" value="previousBackups" /> 
+      <c:choose>
+        <c:when test="${empty(previousBackups)}">
+          <div class="warningmessage">
+            No previous backups found in the default backup directory.
+          </div>
+        </c:when>
+        <c:otherwise>
+          <table>
+            <c:forEach var="backup" items="${previousBackups}">
+              <tr>
+                <td>
+                  <fmt:formatDate value="${backup.date}" pattern="EEE MMM dd, yyyy 'at' HH:mm:ss" />
+                </td>
+                <td>
+                  <c:if test="${backup.userDatabase}">
+                    <c:set var="url">
+                      <s:url action="restore">
+                        <s:param name="restoreDirectory">${backup.directory}</s:param>
+                        <s:param name="userDatabase" value="true" />
+                      </s:url>
+                    </c:set>
+                    <a href="${url}">Restore Users</a>
+                  </c:if>                                         
+                  </td>
+                </tr>
+              </c:forEach>
+            </table>
+          </c:otherwise>
+        </c:choose>
+      </div>
+  </body>
+</s:i18n>
+</html>
+

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/backupRestore.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/backupRestore.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/confirmUserAdministrator.jsp
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/confirmUserAdministrator.jsp?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/confirmUserAdministrator.jsp (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/confirmUserAdministrator.jsp Fri Apr  6 09:58:14 2012
@@ -0,0 +1,64 @@
+<%--
+  ~ Copyright 2010 The Codehaus.
+  ~
+  ~ 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.
+  --%>
+
+<%@ taglib prefix="s" uri="/struts-tags"%>
+<%@ taglib prefix="redback" uri="/redback/taglib-1.0"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<html>
+<s:i18n name="org.codehaus.plexus.redback.struts2.default">
+<head>
+  <title><s:text name="user.edit.confirm.page.title"/></title>
+</head>
+
+<body>
+
+<%@ include file="/WEB-INF/jsp/redback/include/formValidationResults.jsp" %>
+
+<h2><s:text name="user.edit.confirm.section.title"/></h2>
+
+<redback:ifAuthorized permission="user-management-user-edit" resource="${user.username}">
+
+  <s:form action="useredit" namespace="/security" theme="xhtml"
+         id="userEditForm" method="post" cssClass="security userEdit">
+    <redback:isNotReadOnlyUserManager>
+      <p>
+        You must re-confirm your password to proceed with the request to
+        <strong>edit the account information</strong> for user: <strong>${user.username}</strong>
+      </p>
+
+      <s:password label="%{getText('user.admin.password')}" name="userAdminPassword" size="20" required="true"/>
+      <s:hidden label="Username"    name="username" />
+      <s:hidden name="user.username" value="%{user.username}"/>
+      <s:hidden name="user.fullName" value="%{user.fullName}"/>
+      <s:hidden name="user.email" value="%{user.email}"/>
+      <s:hidden name="user.password" value="%{user.password}"/>
+      <s:hidden name="user.confirmPassword" value="%{user.confirmPassword}"/>
+      <s:hidden name="user.timestampAccountCreation" value="%{user.timestampAccountCreation}"/>
+      <s:hidden name="user.timestampLastLogin" value="%{user.timestampLastLogin}"/>
+      <s:hidden name="user.timestampLastPasswordChange" value="%{user.timestampLastPasswordChange}"/>
+      <s:hidden name="user.locked" value="%{user.locked}"/>
+      <s:hidden name="user.passwordChangeRequired" value="%{user.passwordChangeRequired}"/>
+      <s:hidden name="method:confirmAdminPassword" value="Submit"/>
+      <s:submit id="confirmUserAdminSubmit" value="%{getText('submit')}" method="confirmAdminPassword" />
+      <s:submit id="cancelUserAdminSubmit" value="%{getText('cancel')}" method="cancel" />
+    </redback:isNotReadOnlyUserManager>
+  </s:form>
+</redback:ifAuthorized>
+
+</body>
+</s:i18n>
+</html>

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/confirmUserAdministrator.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/confirmUserAdministrator.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/console.jsp
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/console.jsp?rev=1310268&view=auto
==============================================================================
    (empty)

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/console.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/console.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/createAdmin.jsp
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/createAdmin.jsp?rev=1310268&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/createAdmin.jsp (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/createAdmin.jsp Fri Apr  6 09:58:14 2012
@@ -0,0 +1,40 @@
+<%--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  --%>
+
+<%@ taglib prefix="s" uri="/struts-tags"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<html>
+<s:i18n name="org.codehaus.plexus.redback.struts2.default">
+<head>
+  <title><s:text name="create.admin.page.title"/></title>
+</head>
+
+<body>
+
+<c:import url="/WEB-INF/jsp/redback/include/formValidationResults.jsp" />
+
+<h2><s:text name="create.admin.section.title"/></h2>
+
+<s:form action="addadmin!submit" namespace="/security" theme="xhtml"
+         id="adminCreateForm" method="post" name="admincreate" cssClass="security adminCreate">
+  <c:import url="/WEB-INF/jsp/redback/include/userCredentials.jsp" />
+  <s:submit value="%{getText('create.admin')}" />
+</s:form>
+
+</body>
+</s:i18n>
+</html>

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/createAdmin.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/createAdmin.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision