Author: simonetripodi
Date: Tue Sep 20 16:47:06 2011
New Revision: 1173243
URL: http://svn.apache.org/viewvc?rev=1173243&view=rev
Log:
[DISCOVERY-21] Move to standard Maven layout
Added:
commons/proper/discovery/trunk/src/main/
commons/proper/discovery/trunk/src/main/assembly/
- copied from r1173216, commons/proper/discovery/trunk/src/assembly/
commons/proper/discovery/trunk/src/main/java/
- copied from r1173216, commons/proper/discovery/trunk/src/java/
commons/proper/discovery/trunk/src/test/java/
commons/proper/discovery/trunk/src/test/java/org/
- copied from r1173216, commons/proper/discovery/trunk/src/test/org/
commons/proper/discovery/trunk/src/test/resources/
commons/proper/discovery/trunk/src/test/resources/META-INF/
- copied from r1173216, commons/proper/discovery/trunk/src/test/META-INF/
commons/proper/discovery/trunk/src/test/resources/org/
commons/proper/discovery/trunk/src/test/resources/org/apache/
commons/proper/discovery/trunk/src/test/resources/org/apache/commons/
commons/proper/discovery/trunk/src/test/resources/org/apache/commons/discovery/
commons/proper/discovery/trunk/src/test/resources/org/apache/commons/discovery/test/
commons/proper/discovery/trunk/src/test/resources/org/apache/commons/discovery/test/TestInterface.properties
(with props)
commons/proper/discovery/trunk/src/test/resources/testResource
- copied unchanged from r1173216,
commons/proper/discovery/trunk/src/test/testResource
commons/proper/discovery/trunk/src/test/testAlt1/
- copied from r1173216, commons/proper/discovery/trunk/src/testAlt1/
commons/proper/discovery/trunk/src/test/testAlt2/
- copied from r1173216, commons/proper/discovery/trunk/src/testAlt2/
Removed:
commons/proper/discovery/trunk/src/assembly/
commons/proper/discovery/trunk/src/java/
commons/proper/discovery/trunk/src/test/META-INF/
commons/proper/discovery/trunk/src/test/java/org/apache/commons/discovery/test/TestInterface.properties
commons/proper/discovery/trunk/src/test/org/
commons/proper/discovery/trunk/src/test/testResource
commons/proper/discovery/trunk/src/testAlt1/
commons/proper/discovery/trunk/src/testAlt2/
Modified:
commons/proper/discovery/trunk/pom.xml
Modified: commons/proper/discovery/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/discovery/trunk/pom.xml?rev=1173243&r1=1173242&r2=1173243&view=diff
==============================================================================
--- commons/proper/discovery/trunk/pom.xml (original)
+++ commons/proper/discovery/trunk/pom.xml Tue Sep 20 16:47:06 2011
@@ -132,19 +132,11 @@
</distributionManagement>
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/testResource</include>
- <include>META-INF/**</include>
- </includes>
- </testResource>
- </testResources>
-
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -154,8 +146,8 @@
<include>**/TestAll.java</include>
</includes>
<additionalClasspathElements>
-
<additionalClasspathElement>${basedir}/src/testAlt1</additionalClasspathElement>
-
<additionalClasspathElement>${basedir}/src/testAlt2</additionalClasspathElement>
+
<additionalClasspathElement>${basedir}/src/test/testAlt1</additionalClasspathElement>
+
<additionalClasspathElement>${basedir}/src/test/testAlt2</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
@@ -172,8 +164,8 @@
<configuration>
<attach>false</attach>
<descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
- <descriptor>src/assembly/src.xml</descriptor>
+ <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
+ <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
Added:
commons/proper/discovery/trunk/src/test/resources/org/apache/commons/discovery/test/TestInterface.properties
URL:
http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/test/resources/org/apache/commons/discovery/test/TestInterface.properties?rev=1173243&view=auto
==============================================================================
---
commons/proper/discovery/trunk/src/test/resources/org/apache/commons/discovery/test/TestInterface.properties
(added)
+++
commons/proper/discovery/trunk/src/test/resources/org/apache/commons/discovery/test/TestInterface.properties
Tue Sep 20 16:47:06 2011
@@ -0,0 +1,18 @@
+# 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.
+
+# $Id$
+
+org.apache.commons.discovery.test.TestInterface1=org.apache.commons.discovery.test.TestImpl1_1
Propchange:
commons/proper/discovery/trunk/src/test/resources/org/apache/commons/discovery/test/TestInterface.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/discovery/trunk/src/test/resources/org/apache/commons/discovery/test/TestInterface.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
