http://git-wip-us.apache.org/repos/asf/oodt/blob/c9b8528b/xmlquery/oodt-xmlquery.iml.orig ---------------------------------------------------------------------- diff --git a/xmlquery/oodt-xmlquery.iml.orig b/xmlquery/oodt-xmlquery.iml.orig new file mode 100755 index 0000000..2a91ac8 --- /dev/null +++ b/xmlquery/oodt-xmlquery.iml.orig @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/conf" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/dtd" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="library" name="Clover IDEA Plugin" level="application" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="oodt-commons" /> + <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.2.1" level="project" /> + <orderEntry type="library" name="Maven: xml-apis:xml-apis:2.0.2" level="project" /> + <orderEntry type="library" name="Maven: commons-collections:commons-collections:2.1" level="project" /> + <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.2" level="project" /> + <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.3" level="project" /> + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.3" level="project" /> + <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.4" level="project" /> + <orderEntry type="library" name="Maven: org.springframework:spring-hibernate3:2.0.8" level="project" /> + <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" /> + <orderEntry type="library" name="Maven: org.hibernate:hibernate:3.2.5.ga" level="project" /> + <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:1.2.3" level="project" /> + <orderEntry type="library" name="Maven: asm:asm-attrs:1.5.3" level="project" /> + <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> + <orderEntry type="library" name="Maven: antlr:antlr:2.7.6" level="project" /> + <orderEntry type="library" name="Maven: cglib:cglib:2.1_3" level="project" /> + <orderEntry type="library" name="Maven: asm:asm:1.5.3" level="project" /> + <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.0.8" level="project" /> + <orderEntry type="library" name="Maven: org.springframework:spring-context:2.0.8" level="project" /> + <orderEntry type="library" name="Maven: org.springframework:spring-dao:2.0.8" level="project" /> + <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.0.8" level="project" /> + <orderEntry type="library" name="Maven: xmlrpc:xmlrpc:2.0.1" level="project" /> + <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.2" level="project" /> + </component> +</module> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/oodt/blob/c9b8528b/xmlquery/oodt-xmlquery.iml.rej ---------------------------------------------------------------------- diff --git a/xmlquery/oodt-xmlquery.iml.rej b/xmlquery/oodt-xmlquery.iml.rej new file mode 100755 index 0000000..5a0db6d --- /dev/null +++ b/xmlquery/oodt-xmlquery.iml.rej @@ -0,0 +1,66 @@ +--- xmlquery/oodt-xmlquery.iml ++++ xmlquery/oodt-xmlquery.iml +@@ -5,16 +5,17 @@ + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> +- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/conf" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/dtd" type="java-resource" /> ++ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> ++ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> + <orderEntry type="module" module-name="oodt-commons" /> + <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.2.1" level="project" /> +- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> ++ <orderEntry type="library" name="Maven: xml-apis:xml-apis:2.0.2" level="project" /> + <orderEntry type="library" name="Maven: commons-collections:commons-collections:2.1" level="project" /> + <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.2" level="project" /> + <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.3" level="project" /> +--- xmlquery/oodt-xmlquery.iml ++++ xmlquery/oodt-xmlquery.iml +@@ -1,41 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8"?> +-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> +- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> +- <output url="file://$MODULE_DIR$/target/classes" /> +- <output-test url="file://$MODULE_DIR$/target/test-classes" /> +- <content url="file://$MODULE_DIR$"> +- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> +- <sourceFolder url="file://$MODULE_DIR$/src/main/conf" type="java-resource" /> +- <sourceFolder url="file://$MODULE_DIR$/src/main/dtd" type="java-resource" /> +- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> +- <excludeFolder url="file://$MODULE_DIR$/target" /> +- </content> +- <orderEntry type="inheritedJdk" /> +- <orderEntry type="sourceFolder" forTests="false" /> +- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> +- <orderEntry type="module" module-name="oodt-commons" /> +- <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.2.1" level="project" /> +- <orderEntry type="library" name="Maven: xml-apis:xml-apis:2.0.2" level="project" /> +- <orderEntry type="library" name="Maven: commons-collections:commons-collections:2.1" level="project" /> +- <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.2" level="project" /> +- <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.3" level="project" /> +- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.3" level="project" /> +- <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.4" level="project" /> +- <orderEntry type="library" name="Maven: org.springframework:spring-hibernate3:2.0.8" level="project" /> +- <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" /> +- <orderEntry type="library" name="Maven: org.hibernate:hibernate:3.2.5.ga" level="project" /> +- <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache:1.2.3" level="project" /> +- <orderEntry type="library" name="Maven: asm:asm-attrs:1.5.3" level="project" /> +- <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> +- <orderEntry type="library" name="Maven: antlr:antlr:2.7.6" level="project" /> +- <orderEntry type="library" name="Maven: cglib:cglib:2.1_3" level="project" /> +- <orderEntry type="library" name="Maven: asm:asm:1.5.3" level="project" /> +- <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.0.8" level="project" /> +- <orderEntry type="library" name="Maven: org.springframework:spring-context:2.0.8" level="project" /> +- <orderEntry type="library" name="Maven: org.springframework:spring-dao:2.0.8" level="project" /> +- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:2.0.8" level="project" /> +- <orderEntry type="library" name="Maven: xmlrpc:xmlrpc:2.0.1" level="project" /> +- <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" /> +- <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.2" level="project" /> +- </component> +-</module> \ No newline at end of file
