Author: ryan
Date: Sun Nov 9 11:39:20 2008
New Revision: 712539
URL: http://svn.apache.org/viewvc?rev=712539&view=rev
Log:
moving depot/dynamic to droids-spring
Added:
incubator/droids/trunk/droids-spring/ (props changed)
- copied from r712536, incubator/droids/trunk/depot/dynamic/
incubator/droids/trunk/droids-spring/src/main/
incubator/droids/trunk/droids-spring/src/main/java/ (props changed)
- copied from r712536, incubator/droids/trunk/depot/dynamic/src/java/
incubator/droids/trunk/droids-spring/src/main/resources/
incubator/droids/trunk/droids-spring/src/test/java/
incubator/droids/trunk/droids-spring/src/test/java/org/ (props changed)
- copied from r712536, incubator/droids/trunk/depot/dynamic/src/test/org/
Removed:
incubator/droids/trunk/depot/dynamic/DROIDS-README.txt
incubator/droids/trunk/depot/dynamic/LICENSE.txt
incubator/droids/trunk/depot/dynamic/NOTICE.txt
incubator/droids/trunk/depot/dynamic/conf/
incubator/droids/trunk/depot/dynamic/default.properties
incubator/droids/trunk/depot/dynamic/forrest.properties
incubator/droids/trunk/depot/dynamic/ivy.xml
incubator/droids/trunk/depot/dynamic/lib/
incubator/droids/trunk/depot/dynamic/pom.xml
incubator/droids/trunk/depot/dynamic/src/
incubator/droids/trunk/depot/dynamic/status.xml
incubator/droids/trunk/droids-spring/src/java/
incubator/droids/trunk/droids-spring/src/test/org/
Modified:
incubator/droids/trunk/droids-spring/pom.xml
incubator/droids/trunk/pom.xml
Propchange: incubator/droids/trunk/droids-spring/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/droids/trunk/droids-spring/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-spring/pom.xml?rev=712539&r1=712536&r2=712539&view=diff
==============================================================================
--- incubator/droids/trunk/droids-spring/pom.xml (original)
+++ incubator/droids/trunk/droids-spring/pom.xml Sun Nov 9 11:39:20 2008
@@ -1,31 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- ====================================================================
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project 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";>
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org />.
- -->
-
-<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>
<artifactId>droids</artifactId>
@@ -33,20 +26,14 @@
<version>0.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>droids-dynamic</artifactId>
- <name>Droids Dynamic</name>
+ <artifactId>droids-spring</artifactId>
+ <name>Droids Spring</name>
<inceptionYear>2007</inceptionYear>
<description>
- Droids Runtime
+ Droids Spring Integration
</description>
<packaging>jar</packaging>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/droids/trunk/depot/dymamic</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/droids/trunk/depot/dymamic</developerConnection>
-
<url>http://svn.apache.org/repos/asf/labs/incubator/trunk/depot/dymamic</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>org.apache.droids</groupId>
@@ -68,34 +55,4 @@
</dependency>
</dependencies>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src/java</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- <include>**/*.txt</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <optimize>${maven.compile.optimize}</optimize>
- <showDeprecations>${maven.compile.deprecation}</showDeprecations>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
Propchange: incubator/droids/trunk/droids-spring/src/main/java/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/droids/trunk/droids-spring/src/test/java/org/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/droids/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/pom.xml?rev=712539&r1=712538&r2=712539&view=diff
==============================================================================
--- incubator/droids/trunk/pom.xml (original)
+++ incubator/droids/trunk/pom.xml Sun Nov 9 11:39:20 2008
@@ -188,7 +188,7 @@
<modules>
<module>droids-norobots</module>
<module>droids-core</module>
- <module>depot/dynamic</module>
+ <module>droids-spring</module>
<module>droids-solr</module>
<module>droids-wicket</module>
</modules>
