diff --git a/.classpath b/.classpath index 25cfc7d1c..f596458fb 100644 --- a/.classpath +++ b/.classpath @@ -1,31 +1,18 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/.project b/.project index 4ec64ec39..94203693f 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - data-commons - + spring-data-commons + Spring Data Common Interfaces and Implementations @@ -24,6 +24,9 @@ + + org.eclipse.jdt.core.javabuilder + org.eclipse.wst.common.project.facet.core.nature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 20b5b8e93..caab2af32 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Sat Jul 17 11:18:33 EDT 2010 +#Thu Sep 09 15:12:37 EDT 2010 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.source=1.6 diff --git a/pom.xml b/pom.xml index 02971c62d..dc0f6f0d7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,125 +1,97 @@ 4.0.0 - org.springframework.data - data-commons + spring-data-commons + 1.0.0.M1-SNAPSHOT + Spring Data Commons + Spring Data Common Interfaces and Implementations + http://www.springsource.org jar - 1.0.0.CI-SNAPSHOT - Spring Data Common Interfaces and Implementations + + + org.springframework.data + spring-data-parent + 1.0.0.M1-SNAPSHOT + + + + Issue Tracker + http://jira.springframework.org/browse/DATACOMMONS + + + http://git.springsource.org/spring-data/data-commons + + + SpringSource, a division of VMware + http://www.SpringSource.org + + 2010 + + + + trisberg + Thomas Risberg + trisberg at vmware.com + SpringSource + http://www.SpringSource.com + + Project Admin + Developer + + -5 + + + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + Copyright 2010 the original author or authors. + + Licensed 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. + + + + UTF-8 - 3.0.3.RELEASE 1.6.10.BUILD-SNAPSHOT - 1.6.0 - - - spring-maven-snapshot - - true - - Springframework Maven SNAPSHOT Repository - http://maven.springframework.org/snapshot - - - spring-maven-milestone - - true - - Springframework Maven MILESTONE Repository - http://maven.springframework.org/milestone - - + - - - junit - junit - 4.8.1 - test - - - log4j - log4j - 1.2.15 - - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-test - ${spring.version} - test - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - org.springframework spring-aop - ${spring.version} + ${spring.framework.version} org.springframework spring-aspects - ${spring.version} + ${spring.framework.version} org.springframework spring-tx - ${spring.version} + ${spring.framework.version} + + + commons-logging + commons-logging + 1.1.1 + provided org.aspectj @@ -127,174 +99,17 @@ ${aspectj.version} - - org.mockito - mockito-core - 1.8.0 - test - - - org.mockito - mockito-all - 1.8.0 - test - - - - - javax.persistence - persistence-api - 1.0 - - - - - - maven-assembly-plugin - false - - - project - - - - - org.apache.maven.plugins - maven-jar-plugin - - - target/classes/META-INF/MANIFEST.MF - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.1 - - 1.6 - 1.6 - - - - org.codehaus.mojo - aspectj-maven-plugin - 1.0 - - - - org.aspectj - aspectjrt - ${aspectj.version} - - - org.aspectj - aspectjtools - ${aspectj.version} - - - - - - compile - test-compile - - - - - true - - - org.springframework - spring-aspects - - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - **/*Tests.java - - - **/Abstract*.java - - - - - com.springsource.bundlor - com.springsource.bundlor.maven - 1.0.0.RELEASE - true - - - bundlor-transform - - bundlor - - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.7 - - true - false - 2.0 - - - org.eclipse.ajdt.core.ajbuilder - - org.springframework.aspects - - - - org.springframework.ide.eclipse.core.springbuilder - - - - org.eclipse.ajdt.ui.ajnature - com.springsource.sts.roo.core.nature - org.springframework.ide.eclipse.core.springnature - - - - - org.apache.maven.plugins - maven-idea-plugin - 2.2 - - true - true - - - - - - - Codehaus - http://repository.codehaus.org/ + + + spring-maven-snapshot - false + true - - - com.springsource.repository.bundles.release - SpringSource Enterprise Bundle Repository - http://repository.springsource.com/maven/bundles/release - - + Springframework Maven SNAPSHOT Repository + http://maven.springframework.org/snapshot + + + diff --git a/src/main/java/org/springframework/data/core/DataMapper.java b/src/main/java/org/springframework/data/core/DataMapper.java deleted file mode 100644 index bc7fdf042..000000000 --- a/src/main/java/org/springframework/data/core/DataMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2010 the original author or authors. - * - * Licensed 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. - */ - -package org.springframework.data.core; - -/** - * Class used to map data to a business object. - * - * @author Thomas Risberg - * @since 1.0 - */ -public interface DataMapper { - - T map(S source); - -} diff --git a/src/main/java/org/springframework/data/core/DataValueSource.java b/src/main/java/org/springframework/data/core/DataValueSource.java deleted file mode 100644 index d027458d9..000000000 --- a/src/main/java/org/springframework/data/core/DataValueSource.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2010 the original author or authors. - * - * Licensed 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. - */ - -package org.springframework.data.core; - -/** - * Class used to map a business object to an object providing the data value. - * - * @author Thomas Risberg - * @since 1.0 - */ -public interface DataValueSource { - - T getValue(S source); - -} diff --git a/src/main/java/org/springframework/data/core/QueryDefinition.java b/src/main/java/org/springframework/data/core/QueryDefinition.java deleted file mode 100644 index 61eea7dbf..000000000 --- a/src/main/java/org/springframework/data/core/QueryDefinition.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.springframework.data.core; - -public interface QueryDefinition { - -} diff --git a/src/main/java/org/springframework/datastore/core/AbstractDatastoreTemplate.java b/src/main/java/org/springframework/datastore/core/AbstractDatastoreTemplate.java deleted file mode 100644 index 47a73da10..000000000 --- a/src/main/java/org/springframework/datastore/core/AbstractDatastoreTemplate.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.springframework.datastore.core; - -import java.util.List; - -import org.springframework.data.core.DataMapper; -import org.springframework.data.core.QueryDefinition; - -public abstract class AbstractDatastoreTemplate { - - protected DatastoreConnectionFactory datastoreConnectionFactory; - - public DatastoreConnectionFactory getDatastoreConnectionFactory() { - return datastoreConnectionFactory; - } - - public void setDatastoreConnectionFactory(DatastoreConnectionFactory datastoreConnectionFactory) { - this.datastoreConnectionFactory = datastoreConnectionFactory; - } - - public T execute(DatastoreConnectionCallback action) { - try { - return action.doInConnection(datastoreConnectionFactory.getConnection()); - } - catch (Exception e) { - throw new UncategorizedDatastoreException("Failure executing using datastore connection", e); - } - } - - public abstract List query(QueryDefinition query, DataMapper mapper); - -} diff --git a/src/main/java/org/springframework/datastore/core/DatastoreConnectionCallback.java b/src/main/java/org/springframework/datastore/core/DatastoreConnectionCallback.java deleted file mode 100644 index 712eb0fc1..000000000 --- a/src/main/java/org/springframework/datastore/core/DatastoreConnectionCallback.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.springframework.datastore.core; - -import org.springframework.dao.DataAccessException; - -public interface DatastoreConnectionCallback { - - T doInConnection(C con) throws DataAccessException; -} diff --git a/src/main/java/org/springframework/datastore/core/DatastoreConnectionFactory.java b/src/main/java/org/springframework/datastore/core/DatastoreConnectionFactory.java deleted file mode 100644 index 8eb155b3e..000000000 --- a/src/main/java/org/springframework/datastore/core/DatastoreConnectionFactory.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.springframework.datastore.core; - -public interface DatastoreConnectionFactory { - C getConnection(); -} diff --git a/src/main/java/org/springframework/datastore/core/UncategorizedDatastoreException.java b/src/main/java/org/springframework/datastore/core/UncategorizedDatastoreException.java deleted file mode 100644 index 7e4aa49b0..000000000 --- a/src/main/java/org/springframework/datastore/core/UncategorizedDatastoreException.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.springframework.datastore.core; - -import org.springframework.dao.UncategorizedDataAccessException; - -public class UncategorizedDatastoreException extends - UncategorizedDataAccessException { - - public UncategorizedDatastoreException(String msg, Throwable cause) { - super(msg, cause); - } - -}