archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1212197 [2/2] - in /archiva/trunk: ./ archiva-modules/archiva-web/archiva-webapp-js/ archiva-modules/archiva-web/archiva-webapp-js/src/main/filtered-resources/ archiva-modules/archiva-web/archiva-webapp-js/src/main/java/ archiva-modules/ar...
Date Fri, 09 Dec 2011 00:29:36 GMT
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml?rev=1212197&r1=1212196&r2=1212197&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml
Fri Dec  9 00:29:35 2011
@@ -1,7 +1,180 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ 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.
+  -->
+
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+  <display-name>Apache Archiva</display-name>
+
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>
+        classpath*:META-INF/spring-context.xml,
+        /WEB-INF/applicationContext.xml
+    </param-value>
+  </context-param>
+
+  <filter>
+    <filter-name>encodingFilter</filter-name>
+    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+    <init-param>
+      <param-name>encoding</param-name>
+      <param-value>UTF-8</param-value>
+    </init-param>
+    <init-param>
+      <param-name>forceEncoding</param-name>
+      <param-value>true</param-value>
+    </init-param>
+  </filter>
+
+	<filter-mapping>
+		<filter-name>encodingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+  <listener>
+ 		<listener-class>
+ 			org.springframework.web.context.ContextLoaderListener
+ 		</listener-class>
+ 	</listener>
+ 	<listener>
+ 		<!-- TODO: some Spring technique for this? -->
+ 		<listener-class>
+       org.apache.archiva.web.startup.ArchivaStartup
+     </listener-class>
+ 	</listener>
+
+   <listener>
+     <listener-class>net.sf.ehcache.constructs.web.ShutdownListener</listener-class>
+   </listener>
+
+   <!-- to cleanup temporary group index created during a session -->
+   <listener>
+     <listener-class>org.apache.archiva.webdav.util.TemporaryGroupIndexSessionCleaner</listener-class>
+   </listener>
+
+  <servlet>
+  		<servlet-name>RepositoryServlet</servlet-name>
+  		<servlet-class>
+        org.apache.archiva.webdav.RepositoryServlet
+      </servlet-class>
+  		<!-- Loading this on startup so as to take advantage of configuration listeners -->
+  		<load-on-startup>1</load-on-startup>
+  	</servlet>
+
+  	<servlet>
+  		<servlet-name>XmlRpcServlet</servlet-name>
+  		<servlet-class>
+  			com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet
+  		</servlet-class>
+  		<init-param>
+  			<param-name>serviceListBeanName</param-name>
+  			<param-value>xmlrpcServicesList</param-value>
+  		</init-param>
+  		<init-param>
+  			<param-name>authHandlerBeanName</param-name>
+  			<param-value>xmlRpcAuthenticator</param-value>
+  		</init-param>
+  		<init-param>
+  		  <param-name>enabledForExtensions</param-name>
+  		  <param-value>true</param-value>
+  		</init-param>
+  		<load-on-startup>2</load-on-startup>
+  	</servlet>
+
+    <servlet>
+      <servlet-name>RedbackXmlRpcServlet</servlet-name>
+      <servlet-class>com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet</servlet-class>
+      <init-param>
+        <param-name>serviceListBeanName</param-name>
+        <param-value>redbackXmlrpcServicesList</param-value>
+      </init-param>
+      <init-param>
+        <param-name>authHandlerBeanName</param-name>
+        <param-value>redbackXmlRpcAuthenticator</param-value>
+      </init-param>
+      <init-param>
+        <param-name>enabledForExtensions</param-name>
+        <param-value>true</param-value>
+      </init-param>
+    </servlet>
+
+  	<servlet>
+  		<servlet-name>RssFeedServlet</servlet-name>
+  		<servlet-class>
+        org.apache.archiva.web.rss.RssFeedServlet
+      </servlet-class>
+  	</servlet>
+
+  	<servlet-mapping>
+  		<servlet-name>RssFeedServlet</servlet-name>
+  		<url-pattern>/feeds/*</url-pattern>
+  	</servlet-mapping>
+
+  	<servlet-mapping>
+  		<servlet-name>RepositoryServlet</servlet-name>
+  		<url-pattern>/repository/*</url-pattern>
+  	</servlet-mapping>
+
+  	<servlet-mapping>
+  		<servlet-name>XmlRpcServlet</servlet-name>
+  		<url-pattern>/xmlrpc</url-pattern>
+  	</servlet-mapping>
+
+    <servlet-mapping>
+      <servlet-name>RedbackXmlRpcServlet</servlet-name>
+      <url-pattern>/redback-xmlrpc</url-pattern>
+    </servlet-mapping>
+
+  	<resource-ref>
+  		<res-ref-name>jdbc/users</res-ref-name>
+  		<res-type>javax.sql.DataSource</res-type>
+  		<res-auth>Container</res-auth>
+  		<res-sharing-scope>Shareable</res-sharing-scope>
+  	</resource-ref>
+  	<resource-ref>
+  		<res-ref-name>mail/Session</res-ref-name>
+  		<res-type>javax.mail.Session</res-type>
+  		<res-auth>Container</res-auth>
+  		<res-sharing-scope>Shareable</res-sharing-scope>
+  	</resource-ref>
+
+
+  <servlet>
+    <servlet-name>CXFServlet</servlet-name>
+    <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>CXFServlet</servlet-name>
+    <url-pattern>/restServices/*</url-pattern>
+  </servlet-mapping>
+  
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+
+  <session-config>
+    <!-- 30 minutes session timeout -->
+    <session-timeout>30</session-timeout>
+  </session-config>
 
-<web-app>
-  <display-name>Archetype Created Web Application</display-name>
 </web-app>

Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1212197&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
(added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
Fri Dec  9 00:29:35 2011
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <link rel="stylesheet" href="css/aristo.css"/>
+    <link rel="stylesheet" href="css/bootstrap.min.1.4.0.css">
+
+  <script type="text/javascript" src="js/jquery-1.7.js"></script>
+
+  <script type="text/javascript" src="js/lab.js"></script>
+  <script type="text/javascript" src="js/require.1.0.1.js"></script>
+
+</head>
+
+<body style="padding-top: 40px;">
+
+<div id="topbar-menu-container"></div>
+
+<div class="container-fluid">
+  <div class="sidebar" id="sidebar-content"></div>
+
+  <div class="content">
+    <div class="row" id="user-messages"></div>
+
+    <div class="row" id="main-content"></div>
+  </div>
+</div>
+
+
+
+
+<div id="html-fragments" class="hide"></div>
+
+</body>
+
+<div id="dialog-confirm" title="" style="display: none">
+</div>
+
+<script type="text/javascript">
+    require.config({
+        baseUrl: "js/"
+      });
+    $LAB.setGlobalDefaults({AlwaysPreserveOrder:true,BasePath:"js/",explicit_preloading:false});
+    $LAB
+       .script("utils.js").wait()
+       .script("jquery.tmpl.js").wait()
+       .script("jquery.cookie.1.0.0.js").wait()
+       .script("knockout-debug.js").wait()
+       .script("jquery-ui-1.8.16.custom.min.js").wait()
+       .script("redback/register.js").wait()
+       .script("jquery.i18n.properties-1.0.9.js").wait()
+       .script("redback/i18nload.js").wait()
+       .script("jquery.validate.js").wait()
+       .script("jquery.json-2.3.min.js").wait()
+       .script("redback/operation.js").wait()
+       .script("main-tmpl.js").wait()
+       .script("redback/redback-tmpl.js").wait()
+       .script("bootstrap-modal.js").wait()
+       .script("bootstrap-alerts.js").wait()
+       .script("bootstrap-dropdown.js").wait()
+       .script("knockout.simpleGrid.js").wait()
+       .script("redback/user.js").wait()
+       .script("redback/users.js").wait()
+       .script("main.js");
+
+</script>
+
+</html>

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/auto-admin-creation.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/auto-admin-creation.properties?rev=1212197&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/auto-admin-creation.properties
(added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/auto-admin-creation.properties
Fri Dec  9 00:29:35 2011
@@ -0,0 +1,22 @@
+#
+# 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.admin.fullname=Archiva Admin
+redback.admin.email=admin@toto.com
+redback.admin.password=admin123
\ No newline at end of file

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/auto-admin-creation.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/auto-admin-creation.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j.xml?rev=1212197&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j.xml
(added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j.xml
Fri Dec  9 00:29:35 2011
@@ -0,0 +1,80 @@
+<?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.archiva.indexer.search.NexusRepositorySearch">
+    <level value="debug"/>
+  </logger>
+  <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils">
+    <level value="debug"/>
+  </logger>
+  <logger name="JPOX">
+    <level value="error"/>
+  </logger>
+
+  <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder">
+    <level value="error"/>
+  </logger>
+
+  <logger name="org.apache.archiva.admin.repository.managed">
+    <level value="debug"/>
+  </logger>
+
+
+
+  <logger name="org.springframework">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.codehaus.plexus">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.codehaus.redback">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.apache.cxf">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.quartz">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.apache.archiva.indexer.merger">
+    <level value="debug"/>
+  </logger>
+
+  <root>
+    <priority value ="info" />
+    <appender-ref ref="console" />
+  </root>
+
+</log4j:configuration>

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/tomcat-context-archiva.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/tomcat-context-archiva.xml?rev=1212197&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/tomcat-context-archiva.xml
(added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/tomcat-context-archiva.xml
Fri Dec  9 00:29:35 2011
@@ -0,0 +1,31 @@
+<?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.
+  -->
+<Context path="/archiva">
+  <Resource name="jdbc/users" auth="Container" type="javax.sql.DataSource"
+            username="sa"
+            password=""
+            driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+            url="jdbc:derby:${catalina.base}/target/database/users;create=true"
+  />
+  <Resource name="mail/Session" auth="Container"
+          type="javax.mail.Session"
+          mail.smtp.host="localhost"/>
+                
+</Context>

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/tomcat-context-archiva.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/tomcat-context-archiva.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1212197&r1=1212196&r2=1212197&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Fri Dec  9 00:29:35 2011
@@ -922,6 +922,17 @@
         </exclusions>
       </dependency>
       <dependency>
+        <groupId>org.codehaus.redback</groupId>
+        <artifactId>redback-integrations-security</artifactId>
+        <version>${redback.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
         <groupId>org.apache.velocity</groupId>
         <artifactId>velocity</artifactId>
         <version>1.7</version>



Mime
View raw message