Author: olamy
Date: Sat Sep 3 08:05:44 2011
New Revision: 1164820
URL: http://svn.apache.org/viewvc?rev=1164820&view=rev
Log:
get RID of org.apache.maven.archiva packages : startup package in webapp
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/
- copied from r1164818,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/
- copied from r1164818,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaVersion.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/Banner.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java?rev=1164820&r1=1164818&r2=1164820&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
Sat Sep 3 08:05:44 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.web.startup;
+package org.apache.archiva.web.startup;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -34,7 +34,6 @@ import org.springframework.web.context.s
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import java.io.IOException;
import java.lang.reflect.Field;
import java.util.concurrent.ExecutorService;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaVersion.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaVersion.java?rev=1164820&r1=1164818&r2=1164820&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaVersion.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaVersion.java
Sat Sep 3 08:05:44 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.web.startup;
+package org.apache.archiva.web.startup;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/Banner.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/Banner.java?rev=1164820&r1=1164818&r2=1164820&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/Banner.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/Banner.java
Sat Sep 3 08:05:44 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.web.startup;
+package org.apache.archiva.web.startup;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java?rev=1164820&r1=1164818&r2=1164820&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
Sat Sep 3 08:05:44 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.web.startup;
+package org.apache.archiva.web.startup;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -53,7 +53,7 @@ import java.util.Map.Entry;
* ConfigurationSynchronization
*
* @version $Id$
- * plexus.component
role="org.apache.maven.archiva.web.startup.SecuritySynchronization"
+ * plexus.component
role="org.apache.archiva.web.startup.SecuritySynchronization"
* role-hint="default"
*/
@Service
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=1164820&r1=1164819&r2=1164820&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Sat Sep 3 08:05:44 2011
@@ -26,7 +26,7 @@
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<%@ taglib prefix="redback"
uri="http://plexus.codehaus.org/redback/taglib-1.0"; %>
<%@ page import="java.util.Calendar" %>
-<%@ page import="org.apache.maven.archiva.web.startup.ArchivaVersion" %>
+<%@ page import="org.apache.archiva.web.startup.ArchivaVersion" %>
<html>
<head>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml?rev=1164820&r1=1164819&r2=1164820&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
Sat Sep 3 08:05:44 2011
@@ -81,8 +81,8 @@
<listener>
<!-- TODO: some Spring technique for this? -->
<listener-class>
- org.apache.maven.archiva.web.startup.ArchivaStartup
- </listener-class>
+ org.apache.archiva.web.startup.ArchivaStartup
+ </listener-class>
</listener>
<context-param>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java?rev=1164820&r1=1164818&r2=1164820&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/startup/BannerTest.java
Sat Sep 3 08:05:44 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.web.startup;
+package org.apache.archiva.web.startup;
/*
* Licensed to the Apache Software Foundation (ASF) under one
