Author: kmenard
Date: Wed Apr 29 01:58:32 2009
New Revision: 769625
URL: http://svn.apache.org/viewvc?rev=769625&view=rev
Log:
Moved SmartNamingStrategy to cayenne-tools module.
Added:
cayenne/main/trunk/framework/cayenne-tools/src/
cayenne/main/trunk/framework/cayenne-tools/src/main/
cayenne/main/trunk/framework/cayenne-tools/src/main/java/
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/map/
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/SmartNamingStrategy.java
- copied, changed from r769624,
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/SmartNamingStrategy.java
cayenne/main/trunk/framework/cayenne-tools/src/test/
cayenne/main/trunk/framework/cayenne-tools/src/test/java/
cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/
cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/
cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/
cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/map/
cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/
cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/SmartNamingStrategyTest.java
- copied, changed from r769624,
cayenne/main/trunk/framework/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/SmartNamingStrategyTest.java
Removed:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/SmartNamingStrategy.java
cayenne/main/trunk/framework/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/SmartNamingStrategyTest.java
Modified:
cayenne/main/trunk/framework/cayenne-modeler/pom.xml
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
cayenne/main/trunk/framework/cayenne-tools/pom.xml
Modified: cayenne/main/trunk/framework/cayenne-modeler/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/pom.xml?rev=769625&r1=769624&r2=769625&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/pom.xml Wed Apr 29 01:58:32
2009
@@ -96,6 +96,12 @@
<version>${version}</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-tools</artifactId>
+ <version>${version}</version>
+ </dependency>
<dependency>
<groupId>ognl</groupId>
@@ -117,12 +123,6 @@
<artifactId>jedit-syntax</artifactId>
<version>2.2.2</version>
</dependency>
-
- <dependency>
- <groupId>net.java.dev.inflector</groupId>
- <artifactId>inflector</artifactId>
- <version>0.7.0</version>
- </dependency>
</dependencies>
<build>
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java?rev=769625&r1=769624&r2=769625&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
(original)
+++
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
Wed Apr 29 01:58:32 2009
@@ -67,7 +67,7 @@
private static final Vector<String> PREDEFINED_STRATEGIES = new
Vector<String>();
static {
PREDEFINED_STRATEGIES.add("org.apache.cayenne.map.naming.BasicNamingStrategy");
-
PREDEFINED_STRATEGIES.add("org.apache.cayenne.modeler.util.SmartNamingStrategy");
+
PREDEFINED_STRATEGIES.add("org.apache.cayenne.map.naming.SmartNamingStrategy");
};
public static final int CANCEL = 0;
Modified: cayenne/main/trunk/framework/cayenne-tools/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/pom.xml?rev=769625&r1=769624&r2=769625&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-tools/pom.xml Wed Apr 29 01:58:32 2009
@@ -33,72 +33,121 @@
<artifactId>cayenne-tools</artifactId>
<packaging>jar</packaging>
<name>Cayenne Tools</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.objectstyle.ashwood</groupId>
+ <artifactId>ashwood</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.unpublished</groupId>
+ <artifactId>cayenne-legal-unpublished</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.unpublished</groupId>
+ <artifactId>cayenne-jdk1.5-unpublished</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>mockrunner</groupId>
+ <artifactId>mockrunner</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.inflector</groupId>
+ <artifactId>inflector</artifactId>
+ <version>0.7.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+
<artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <outputDirectory>
+
${project.build.directory}/classes
+ </outputDirectory>
+ <resourceBundles>
+ <resourceBundle>
+
org.apache.cayenne.unpublished:cayenne-legal-unpublished:${version}
+
</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-source-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.9</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0.9</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.9</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-tools-api</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <!-- even though the runtime dependency is on 'cayenne-server',
- need to mention this one here as to fix the build
failure from the parent folder
- -->
- <dependency>
- <groupId>org.apache.cayenne.unpublished</groupId>
- <artifactId>cayenne-jdk1.5-unpublished</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-server</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>foundrylogic.vpp</groupId>
- <artifactId>vpp</artifactId>
- <scope>compile</scope>
- </dependency>
-
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
-
+ </build>
+ </project>
\ No newline at end of file
Copied:
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/SmartNamingStrategy.java
(from r769624,
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/SmartNamingStrategy.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/SmartNamingStrategy.java?p2=cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/SmartNamingStrategy.java&p1=cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/SmartNamingStrategy.java&r1=769624&r2=769625&rev=769625&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/SmartNamingStrategy.java
(original)
+++
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/SmartNamingStrategy.java
Wed Apr 29 01:58:32 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.map.naming;
import java.util.Locale;
Copied:
cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/SmartNamingStrategyTest.java
(from r769624,
cayenne/main/trunk/framework/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/SmartNamingStrategyTest.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/SmartNamingStrategyTest.java?p2=cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/SmartNamingStrategyTest.java&p1=cayenne/main/trunk/framework/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/SmartNamingStrategyTest.java&r1=769624&r2=769625&rev=769625&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/SmartNamingStrategyTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/SmartNamingStrategyTest.java
Wed Apr 29 01:58:32 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.map.naming;
import junit.framework.TestCase;
