http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/idea/xml (2) (org.apache.isis.runtimes.dflt.profilestores).iml ---------------------------------------------------------------------- diff --git a/idea/xml (2) (org.apache.isis.runtimes.dflt.profilestores).iml b/idea/xml (2) (org.apache.isis.runtimes.dflt.profilestores).iml new file mode 100644 index 0000000..76abc06 --- /dev/null +++ b/idea/xml (2) (org.apache.isis.runtimes.dflt.profilestores).iml @@ -0,0 +1,39 @@ +<?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$/../component/profilestore/xml/target/classes" /> + <output-test url="file://$MODULE_DIR$/../component/profilestore/xml/target/test-classes" /> + <content url="file://$MODULE_DIR$/../component/profilestore/xml"> + <sourceFolder url="file://$MODULE_DIR$/../component/profilestore/xml/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../component/profilestore/xml/src/test/java" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/../component/profilestore/xml/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="isis-metamodel" scope="TEST" production-on-test="" /> + <orderEntry type="module" module-name="applib" /> + <orderEntry type="library" name="Maven: joda-time:joda-time:2.1" level="project" /> + <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" /> + <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" /> + <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" /> + <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> + <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> + <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.7" level="project" /> + <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" /> + <orderEntry type="library" name="Maven: com.google.inject:guice:3.0" level="project" /> + <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" /> + <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" /> + <orderEntry type="module" module-name="isis-unittestsupport" scope="TEST" /> + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.5.1" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-junit4:2.5.1" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.5.1" level="project" /> + <orderEntry type="module" module-name="runtime" /> + <orderEntry type="module" module-name="isis-metamodel" /> + <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> + <orderEntry type="module" module-name="runtime" scope="TEST" production-on-test="" /> + <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" /> + </component> +</module> +
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/isis-parent/pom.xml ---------------------------------------------------------------------- diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml index 33d49ee..94642bb 100644 --- a/isis-parent/pom.xml +++ b/isis-parent/pom.xml @@ -213,7 +213,7 @@ <ciManagement> <system>Hudson</system> - <url>https://hudson.apache.org/hudson/job/Isis-trunk-windows</url> + <url>https://hudson.apache.org/hudson/job/Isis-trunk-ubuntu</url> <notifiers> <notifier> <type>mail</type> @@ -1055,6 +1055,13 @@ archetype includes this explicit dependency. <dependencyManagement> <dependencies> + <!-- JodaTime --> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>2.1</version> + </dependency> + <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> @@ -1318,13 +1325,6 @@ archetype includes this explicit dependency. <scope>test</scope> </dependency> - <!-- JodaTime --> - <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>2.1</version> - </dependency> - <!-- Specs --> <dependency> <groupId>org.apache.geronimo.specs</groupId> http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 21d2a7a..8540706 100644 --- a/pom.xml +++ b/pom.xml @@ -36,10 +36,17 @@ <modules> <module>isis-parent</module> +<!-- <module>site-skin</module> +--> <module>core</module> + <module>component/objectstore/xml</module> + <module>component/objectstore/sql</module> + <module>component/objectstore/nosql</module> + <module>component/objectstore/jdo</module> +<!-- <module>component/progmodel/wrapper</module> <module>component/progmodel/groovy</module> @@ -50,10 +57,6 @@ <module>component/security/ldap</module> <module>component/security/sql</module> - <module>component/objectstore/xml</module> - <module>component/objectstore/sql</module> - <module>component/objectstore/nosql</module> - <module>component/objectstore/jdo</module> <module>component/viewer/dnd</module> <module>component/viewer/dnd-tck</module> @@ -75,12 +78,15 @@ <module>example/archetype/quickstart</module> + <module>example/domain-service/email-service</module> <module>example/misc/metamodel/namefile</module> + +--> + <!-- <module>example/misc/metamodel/jsr303</module> --> - <module>example/domain-service/email-service</module> </modules> http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/site-skin/pom.xml ---------------------------------------------------------------------- diff --git a/site-skin/pom.xml b/site-skin/pom.xml index a247021..7750666 100644 --- a/site-skin/pom.xml +++ b/site-skin/pom.xml @@ -22,14 +22,15 @@ <parent> <groupId>org.apache.isis</groupId> - <artifactId>isis</artifactId> + <artifactId>isis-parent</artifactId> <version>0.3.1-SNAPSHOT</version> + <relativePath>../isis-parent/pom.xml</relativePath> </parent> - <groupId>org.apache.isis.skins</groupId> - <artifactId>classic-skin</artifactId> + <groupId>org.apache.isis.skin</groupId> + <artifactId>isis-site-skin</artifactId> - <name>Isis Skin</name> + <name>Isis Classic Skin</name> <properties> <siteBaseDir>..</siteBaseDir>
