Author: mrdon
Date: Wed Sep 27 09:05:05 2006
New Revision: 450490
URL: http://svn.apache.org/viewvc?view=rev&rev=450490
Log:
Moved plexus into its own plugin
WW-1457
Added:
struts/struts2/trunk/plugins/plexus/
struts/struts2/trunk/plugins/plexus/pom.xml
struts/struts2/trunk/plugins/plexus/src/
struts/struts2/trunk/plugins/plexus/src/main/
struts/struts2/trunk/plugins/plexus/src/main/java/
struts/struts2/trunk/plugins/plexus/src/main/java/org/
struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/
struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/
struts/struts2/trunk/plugins/plexus/src/main/java/org/apache/struts2/plexus/
- copied from r450303,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/
Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/
Modified:
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=450490&r1=450489&r2=450490
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Wed Sep 27 09:05:05 2006
@@ -229,14 +229,6 @@
<optional>true</optional>
</dependency>
- <!-- Plexus -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-10-SNAPSHOT</version>
- <optional>true</optional>
- </dependency>
-
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=450490&r1=450489&r2=450490
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Wed Sep 27 09:05:05 2006
@@ -184,9 +184,9 @@
// dependencies on spring, since it isn't technically
required.
className =
"org.apache.struts2.spring.StrutsSpringObjectFactory";
} else if (className.equals("plexus")) {
- // note: this class name needs to be in string form so we
don't put hard
- // dependencies on spring, since it isn't technically
required.
className = "org.apache.struts2.plexus.PlexusObjectFactory";
+ LOG.warn("The 'plexus' shorthand for the Plexus ObjectFactory
is deprecated. Please "
+ +"use the full class name: "+className);
}
try {
Added: struts/struts2/trunk/plugins/plexus/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/pom.xml?view=auto&rev=450490
==============================================================================
--- struts/struts2/trunk/plugins/plexus/pom.xml (added)
+++ struts/struts2/trunk/plugins/plexus/pom.xml Wed Sep 27 09:05:05 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.apache.struts</groupId>
+ <artifactId>struts2-plugins</artifactId>
+ <version>2.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-plexus-plugin</artifactId>
+ <packaging>jar</packaging>
+ <name>Struts 2 Plexus Plugin</name>
+
+ <distributionManagement>
+ <site>
+ <id>apache-site</id>
+
<url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/plexus</url>
+ </site>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-10-SNAPSHOT</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
