You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/10/18 20:30:10 UTC
svn commit: r1023938 [3/3] - in /incubator/isis/trunk: ./ alternatives/
alternatives/objectstore/nosql/
alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/
alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensio...
Modified: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/pom.xml Mon Oct 18 18:30:03 2010
@@ -1,200 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache Isis Application</name>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <version>${version}</version>
- <packaging>pom</packaging>
-
- <parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>release</artifactId>
- <version>0.1-SNAPSHOT</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
-
- <executions>
- <execution>
- <id>source</id>
- <phase>compile</phase>
- </execution>
- <execution>
- <id>test</id>
- <phase>test-compile</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/Test*.java</exclude>
- </excludes>
- <useFile>true</useFile>
- <printSummary>false</printSummary>
- <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/Test*.java</exclude>
- </excludes>
- <showSuccess>false</showSuccess>
- </configuration>
- <executions>
- <execution>
- <phase>test</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <preparationGoals>clean install</preparationGoals>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <!-- General project overview -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <inherited>false</inherited>
- <reports>
- <report>license</report>
- <report>project-team</report>
- <report>issue-tracking</report>
- <report>scm</report>
- <report>cim</report>
- </reports>
- </reportSet>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>dependency-convergence</report>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <!-- Unit tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
-
- <!-- API docs -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- <doctitle>Apache Isis Application</doctitle>
- <splitindex>false</splitindex>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-
- <dependencyManagement>
- <dependencies>
-
- <!-- this project's own modules -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-dom</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-fixture</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-service</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-commandline</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-webapp</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Scimpi -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${rootArtifactId}-scimpi</artifactId>
- <version>${project.version}</version>
- </dependency>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+
+ <name>Apache Isis Application</name>
+
+ <packaging>pom</packaging>
- </dependencies>
- </dependencyManagement>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ <executions>
+ <execution>
+ <id>source</id>
+ <phase>compile</phase>
+ </execution>
+ <execution>
+ <id>test</id>
+ <phase>test-compile</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <useFile>true</useFile>
+ <printSummary>false</printSummary>
+ <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <showSuccess>false</showSuccess>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <!-- General project overview -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <inherited>false</inherited>
+ <reports>
+ <report>license</report>
+ <report>project-team</report>
+ <report>issue-tracking</report>
+ <report>scm</report>
+ <report>cim</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>dependency-convergence</report>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
+ <!-- Unit tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+
+ <!-- API docs -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ <doctitle>Apache Isis Application</doctitle>
+ <splitindex>false</splitindex>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+
+ <dependencyManagement>
+ <dependencies>
+
+ <!-- Apache Isis -->
+ <dependency>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>release</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- this project's own modules -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${rootArtifactId}-dom</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${rootArtifactId}-fixture</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${rootArtifactId}-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${rootArtifactId}-commandline</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${rootArtifactId}-webapp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <id>snapshots</id>
- <name>Apache Isis Snapshots</name>
- <url>http://isis.apache.org/m2-repo/snapshot/</url>
- <layout>default</layout>
- </repository>
- </repositories>
-
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/pom.xml Mon Oct 18 18:30:03 2010
@@ -1,80 +1,142 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <name>Apache Isis exploration application</name>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <version>${version}</version>
-
- <parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>release</artifactId>
- <version>0.1-SNAPSHOT</version>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.isis.runtime.Isis</mainClass>
- <addClasspath>true</addClasspath>
- <addExtensions>false</addExtensions>
- <classpathPrefix>lib</classpathPrefix>
- </manifest>
- </archive>
- <finalName>${rootArtifactId}</finalName>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/descriptor.xml</descriptor>
- </descriptors>
- <finalName>${artifactId}-${version}</finalName>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- Apache Isis -->
- <dependency>
- <groupId>org.apache.isis.defaults</groupId>
- <artifactId>bytecode</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>html</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>webserver</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>dnd</artifactId>
- </dependency>
- <!-- To be tested: -->
- <!--
- <dependency>
- <groupId>org.apache.isis.alternatives.objectstore</groupId>
- <artifactId>xml</artifactId>
- </dependency>
- -->
- </dependencies>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+
+ <name>Apache Isis Exploration</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ <executions>
+ <execution>
+ <id>source</id>
+ <phase>compile</phase>
+ </execution>
+ <execution>
+ <id>test</id>
+ <phase>test-compile</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.isis.Isis</mainClass>
+ <addClasspath>true</addClasspath>
+ <addExtensions>false</addExtensions>
+ <classpathPrefix>lib</classpathPrefix>
+ </manifest>
+ </archive>
+ <finalName>${rootArtifactId}</finalName>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/descriptor.xml</descriptor>
+ </descriptors>
+ <finalName>${artifactId}-${version}</finalName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Apache Isis -->
+ <dependency>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>release</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <!-- Isis Core -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>webserver</artifactId>
+ </dependency>
+
+ <!-- Isis Defaults -->
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>bytecode</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>objectstore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>progmodel</artifactId>
+ </dependency>
+
+ <!-- Isis Alternatives -->
+ <dependency>
+ <groupId>org.apache.isis.alternatives.objectstore</groupId>
+ <artifactId>xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.alternatives.security</groupId>
+ <artifactId>file</artifactId>
+ </dependency>
+
+ <!-- Isis Viewers -->
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>dnd</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>html</artifactId>
+ </dependency>
+
+ </dependencies>
</project>
Modified: incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/pom.xml Mon Oct 18 18:30:03 2010
@@ -5,10 +5,12 @@
<modelVersion>4.0.0</modelVersion>
- <name>Scimpi Web App</name>
- <artifactId>${parent.artifactId}-${artifactId}</artifactId>
<groupId>${groupId}</groupId>
- <version>0.1-SNAPSHOT</version>
+ <artifactId>${parent.artifactId}-${artifactId}</artifactId>
+ <version>${version}</version>
+
+ <name>Scimpi Web App</name>
+
<packaging>war</packaging>
<build>
@@ -16,19 +18,31 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
<configuration>
- <wtpversion>1.5</wtpversion>
- <wtpContextName>${artifactId}</wtpContextName>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
+ <executions>
+ <execution>
+ <id>source</id>
+ <phase>compile</phase>
+ </execution>
+ <execution>
+ <id>test</id>
+ <phase>test-compile</phase>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -43,61 +57,68 @@
</plugins>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Apache Isis -->
+ <dependency>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>release</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
- <dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>scimpi-servlet</artifactId>
- <version>0.1-SNAPSHOT</version>
- </dependency>
-
-
<dependency>
<groupId>${groupId}</groupId>
<artifactId>${parent.artifactId}-fixture</artifactId>
</dependency>
- <!-- Apache Isis -->
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>bytecode-cglib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>bytecode-javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>remoting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>webserver</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>dnd-viewer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>html-viewer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>http-remoting-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>http-remoting-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>headless-embedded</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>xml-persistor</artifactId>
- </dependency>
+ <!-- Isis Core -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>webserver</artifactId>
+ </dependency>
+
+ <!-- Isis Defaults -->
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>bytecode</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>objectstore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>progmodel</artifactId>
+ </dependency>
+
+ <!-- Isis Alternatives -->
+ <dependency>
+ <groupId>org.apache.isis.alternatives.objectstore</groupId>
+ <artifactId>xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.alternatives.security</groupId>
+ <artifactId>file</artifactId>
+ </dependency>
+
+ <!-- Isis Viewers -->
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>scimpi-servlet</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/isis/trunk/support/src/site/apt/jottings.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/src/site/apt/jottings.apt?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/support/src/site/apt/jottings.apt (original)
+++ incubator/isis/trunk/support/src/site/apt/jottings.apt Mon Oct 18 18:30:03 2010
@@ -40,21 +40,27 @@ Building an exploration application from
the command line:
In your (future) Eclipse workspace directory, run the following:
- "mvn archetype:generate -DarchetypeGroupId=org.apache.isis -DarchetypeArtifactId=exploration-archetype"
+ "mvn archetype:generate -DarchetypeGroupId=org.apache.isis.support.archetypes -DarchetypeArtifactId=exploration"
When prompted, for groupId, specify your package name. For artifactId, specify your application name.
Use the defaults for the next questions (version, package, accept).
- Change into your newly created appliction directory.
+ Change into your newly created application directory.
- Create the Eclipse project files with: "mvn eclipse:eclipse"
+ Either:
- In eclipse, import the project using "File ->Import -> General -> Existing Projects into Workspace"
+ * Create the Eclipse project files with: "mvn eclipse:eclipse"
+
+ * In eclipse, import the project using "File ->Import -> General -> Existing Projects into Workspace"
and navigate to the directory where you created the application from the archetype.
- To enable full Maven integration, right-click on the project in Eclipse and choose
+ * Enable full Maven integration, right-click on the project in Eclipse and choose
"M2 Maven -> Enable dependency management".
+ Or rather more simply:
+
+ * In eclipse, import the project using "File -> Import -> Maven -> Existing Maven Projects
+
Application Archetype
Has a different project layout to exploration, above.
Modified: incubator/isis/trunk/viewer/dnd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/pom.xml (original)
+++ incubator/isis/trunk/viewer/dnd/pom.xml Mon Oct 18 18:30:03 2010
@@ -44,6 +44,17 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>objectstore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>objectstore</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/ViewerFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/ViewerFrame.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/ViewerFrame.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/ViewerFrame.java Mon Oct 18 18:30:03 2010
@@ -31,7 +31,7 @@ import java.awt.event.WindowEvent;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.isis.metamodel.commons.about.AboutIsis;
+import org.apache.isis.runtime.about.AboutIsis;
import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
import org.apache.isis.extensions.dnd.view.Toolkit;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarCellContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarCellContent.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarCellContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarCellContent.java Mon Oct 18 18:30:03 2010
@@ -24,10 +24,10 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.Veto;
import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
import org.apache.isis.extensions.dnd.view.Content;
import org.apache.isis.extensions.dnd.view.collection.AbstractCollectionContent;
import org.apache.isis.runtime.context.IsisContext;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java Mon Oct 18 18:30:03 2010
@@ -24,11 +24,11 @@ package org.apache.isis.extensions.dnd.c
import java.util.Date;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.value.DateValueFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
import org.apache.isis.extensions.dnd.drawing.Canvas;
import org.apache.isis.extensions.dnd.drawing.Location;
import org.apache.isis.extensions.dnd.drawing.Size;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/AbstractField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/AbstractField.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/AbstractField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/AbstractField.java Mon Oct 18 18:30:03 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.dnd.field;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
import org.apache.isis.commons.lang.ToString;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
import org.apache.isis.metamodel.consent.Allow;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.extensions.dnd.drawing.Canvas;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ColorField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ColorField.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ColorField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ColorField.java Mon Oct 18 18:30:03 2010
@@ -21,8 +21,8 @@
package org.apache.isis.extensions.dnd.field;
import org.apache.isis.metamodel.adapter.InvalidEntryException;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
import org.apache.isis.metamodel.facets.value.ColorValueFacet;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
import org.apache.isis.extensions.dnd.drawing.Canvas;
import org.apache.isis.extensions.dnd.drawing.Color;
import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/help/AboutView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/help/AboutView.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/help/AboutView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/help/AboutView.java Mon Oct 18 18:30:03 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.dnd.help;
-import org.apache.isis.metamodel.commons.about.AboutIsis;
+import org.apache.isis.runtime.about.AboutIsis;
import org.apache.isis.extensions.dnd.drawing.Canvas;
import org.apache.isis.extensions.dnd.drawing.Color;
import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceObject.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceObject.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceObject.java Mon Oct 18 18:30:03 2010
@@ -22,8 +22,8 @@ package org.apache.isis.extensions.dnd.s
import org.apache.isis.commons.debug.DebugString;
import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.Veto;
import org.apache.isis.metamodel.spec.ObjectSpecification;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java Mon Oct 18 18:30:03 2010
@@ -22,9 +22,9 @@
import org.apache.log4j.Logger;
import org.apache.isis.commons.ensure.Assert;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
import org.apache.isis.metamodel.facets.value.BooleanValueFacet;
import org.apache.isis.metamodel.facets.value.ImageValueFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/BackgroundWork.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/BackgroundWork.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/BackgroundWork.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/BackgroundWork.java Mon Oct 18 18:30:03 2010
@@ -21,7 +21,7 @@
package org.apache.isis.extensions.dnd.view.action;
import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.commons.exceptions.IsisApplicationException;
+import org.apache.isis.commons.exceptions.IsisApplicationException;
import org.apache.isis.extensions.dnd.view.BackgroundTask;
import org.apache.isis.extensions.dnd.view.View;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/CollectionActionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/CollectionActionContent.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/CollectionActionContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/CollectionActionContent.java Mon Oct 18 18:30:03 2010
@@ -21,8 +21,8 @@
package org.apache.isis.extensions.dnd.view.action;
import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.Veto;
import org.apache.isis.metamodel.spec.ObjectSpecification;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/DialoggedObjectOption.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/DialoggedObjectOption.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/DialoggedObjectOption.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/action/DialoggedObjectOption.java Mon Oct 18 18:30:03 2010
@@ -21,8 +21,8 @@
package org.apache.isis.extensions.dnd.view.action;
import org.apache.isis.commons.ensure.Assert;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.extensions.dnd.drawing.Location;
import org.apache.isis.extensions.dnd.view.BackgroundTask;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/FieldErrorView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/FieldErrorView.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/FieldErrorView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/FieldErrorView.java Mon Oct 18 18:30:03 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.dnd.view.base;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
import org.apache.isis.extensions.dnd.drawing.Canvas;
import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
import org.apache.isis.extensions.dnd.drawing.Location;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/NonBuildingSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/NonBuildingSpecification.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/NonBuildingSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/NonBuildingSpecification.java Mon Oct 18 18:30:03 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.dnd.view.base;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
import org.apache.isis.extensions.dnd.view.Axes;
import org.apache.isis.extensions.dnd.view.Content;
import org.apache.isis.extensions.dnd.view.View;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/collection/AbstractCollectionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/collection/AbstractCollectionContent.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/collection/AbstractCollectionContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/collection/AbstractCollectionContent.java Mon Oct 18 18:30:03 2010
@@ -23,9 +23,9 @@ package org.apache.isis.extensions.dnd.v
import java.util.Enumeration;
import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.ConsentAbstract;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/ObjectFieldBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/ObjectFieldBuilder.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/ObjectFieldBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/ObjectFieldBuilder.java Mon Oct 18 18:30:03 2010
@@ -22,9 +22,9 @@ package org.apache.isis.extensions.dnd.v
import org.apache.log4j.Logger;
import org.apache.isis.commons.ensure.Assert;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
import org.apache.isis.commons.filters.Filter;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.spec.feature.ObjectAssociationFilters;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/StandardFields.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/StandardFields.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/StandardFields.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/StandardFields.java Mon Oct 18 18:30:03 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.dnd.view.composite;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
import org.apache.isis.extensions.dnd.view.Axes;
import org.apache.isis.extensions.dnd.view.Content;
import org.apache.isis.extensions.dnd.view.GlobalViewFactory;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractObjectContent.java Mon Oct 18 18:30:03 2010
@@ -21,9 +21,9 @@
package org.apache.isis.extensions.dnd.view.content;
import org.apache.isis.commons.ensure.Assert;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.ConsentAbstract;
import org.apache.isis.metamodel.consent.Veto;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/lookup/SelectionListSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/lookup/SelectionListSpecification.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/lookup/SelectionListSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/lookup/SelectionListSpecification.java Mon Oct 18 18:30:03 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.dnd.view.lookup;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
import org.apache.isis.extensions.dnd.view.Axes;
import org.apache.isis.extensions.dnd.view.Content;
import org.apache.isis.extensions.dnd.view.View;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/message/ExceptionMessageContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/message/ExceptionMessageContent.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/message/ExceptionMessageContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/message/ExceptionMessageContent.java Mon Oct 18 18:30:03 2010
@@ -21,9 +21,9 @@
package org.apache.isis.extensions.dnd.view.message;
import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.commons.exceptions.ExceptionHelper;
+import org.apache.isis.commons.exceptions.IsisApplicationException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.ExceptionHelper;
-import org.apache.isis.metamodel.commons.exceptions.IsisApplicationException;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.Veto;
import org.apache.isis.metamodel.spec.ObjectSpecification;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyContent.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyContent.java Mon Oct 18 18:30:03 2010
@@ -21,8 +21,8 @@
package org.apache.isis.extensions.dnd;
import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.Veto;
import org.apache.isis.metamodel.spec.ObjectSpecification;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyView.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyView.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyView.java Mon Oct 18 18:30:03 2010
@@ -24,8 +24,8 @@ import java.util.Vector;
import org.apache.isis.commons.debug.DebugString;
import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.consent.Veto;
import org.apache.isis.extensions.dnd.drawing.Bounds;
Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/TestToolkit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/TestToolkit.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/TestToolkit.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/TestToolkit.java Mon Oct 18 18:30:03 2010
@@ -24,7 +24,7 @@ import java.util.Enumeration;
import org.apache.isis.commons.debug.DebugInfo;
import org.apache.isis.commons.debug.DebugString;
-import org.apache.isis.metamodel.commons.exceptions.UnexpectedCallException;
+import org.apache.isis.commons.exceptions.UnexpectedCallException;
import org.apache.isis.extensions.dnd.drawing.Background;
import org.apache.isis.extensions.dnd.drawing.Bounds;
import org.apache.isis.extensions.dnd.drawing.Color;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/Welcome.java Mon Oct 18 18:30:03 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.html.action;
-import org.apache.isis.metamodel.commons.about.AboutIsis;
+import org.apache.isis.runtime.about.AboutIsis;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.component.ViewPane;
import org.apache.isis.extensions.html.context.Context;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/About.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/About.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/About.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/misc/About.java Mon Oct 18 18:30:03 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.html.action.misc;
-import org.apache.isis.metamodel.commons.about.AboutIsis;
+import org.apache.isis.runtime.about.AboutIsis;
import org.apache.isis.extensions.html.action.Action;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.component.ViewPane;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/view/ObjectView.java Mon Oct 18 18:30:03 2010
@@ -21,11 +21,11 @@
package org.apache.isis.extensions.html.action.view;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.SpecificationFacets;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.spec.feature.ObjectAssociationFilters;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
import org.apache.isis.extensions.html.component.Block;
import org.apache.isis.extensions.html.component.Component;
import org.apache.isis.extensions.html.component.ComponentFactory;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/ObjectHistory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/ObjectHistory.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/ObjectHistory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/ObjectHistory.java Mon Oct 18 18:30:03 2010
@@ -27,8 +27,8 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.isis.commons.debug.DebugString;
import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
import org.apache.isis.extensions.html.component.Block;
import org.apache.isis.extensions.html.component.Component;
import org.apache.isis.runtime.context.IsisContext;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/crumb/ObjectFieldCrumb.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/crumb/ObjectFieldCrumb.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/crumb/ObjectFieldCrumb.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/crumb/ObjectFieldCrumb.java Mon Oct 18 18:30:03 2010
@@ -21,8 +21,8 @@
package org.apache.isis.extensions.html.crumb;
import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
import org.apache.isis.commons.lang.ToString;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
import org.apache.isis.extensions.html.request.Request;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java Mon Oct 18 18:30:03 2010
@@ -27,10 +27,10 @@ import java.util.Map;
import org.apache.log4j.Logger;
import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.commons.exceptions.IsisApplicationException;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.commons.exceptions.IsisApplicationException;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.extensions.html.action.Action;
import org.apache.isis.extensions.html.action.ActionException;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java Mon Oct 18 18:30:03 2010
@@ -23,11 +23,11 @@ package org.apache.isis.extensions.html.
import java.util.List;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.spec.Persistability;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
import org.apache.isis.extensions.html.action.Action;
import org.apache.isis.extensions.html.action.ActionException;
import org.apache.isis.extensions.html.component.Page;
Modified: incubator/isis/trunk/viewer/junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/pom.xml (original)
+++ incubator/isis/trunk/viewer/junit/pom.xml Mon Oct 18 18:30:03 2010
@@ -14,6 +14,7 @@
<properties>
<trunk.baseDir>${project.build.directory}/../../../..</trunk.baseDir>
+ <core.version>0.1-SNAPSHOT</core.version>
<headless-viewer.version>0.1-SNAPSHOT</headless-viewer.version>
<docbkx.guideTitle>Apache Isis JUnit Support</docbkx.guideTitle>
@@ -27,6 +28,12 @@
<version>${headless-viewer.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>security</artifactId>
+ <version>${core.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>metamodel</artifactId>
@@ -41,6 +48,12 @@
<scope>test</scope>
</dependency>
+ <!-- Required for InMemoryObjectStore -->
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>objectstore</artifactId>
+ </dependency>
+
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
@@ -78,15 +91,6 @@
<version>4.4</version>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </dependency>
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- </dependency>
-
</dependencies>
</project>
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/extensions/headless/junit/internal/IsisSystemUsingInstallersWithinJunit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/extensions/headless/junit/internal/IsisSystemUsingInstallersWithinJunit.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/extensions/headless/junit/internal/IsisSystemUsingInstallersWithinJunit.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/extensions/headless/junit/internal/IsisSystemUsingInstallersWithinJunit.java Mon Oct 18 18:30:03 2010
@@ -20,14 +20,14 @@
package org.apache.isis.extensions.headless.junit.internal;
-import org.junit.internal.runners.TestClass;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.runtime.authentication.standard.noop.NoopAuthenticationManagerInstaller;
-import org.apache.isis.runtime.authorization.standard.noop.NoopAuthorizationManagerInstaller;
-import org.apache.isis.runtime.installers.InstallerLookup;
-import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.system.installers.IsisSystemUsingInstallers;
-import org.apache.isis.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller;
+import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.runtime.authentication.standard.noop.NoopAuthenticationManagerInstaller;
+import org.apache.isis.runtime.authorization.standard.noop.NoopAuthorizationManagerInstaller;
+import org.apache.isis.runtime.installers.InstallerLookup;
+import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.runtime.system.installers.IsisSystemUsingInstallers;
+import org.apache.isis.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller;
+import org.junit.internal.runners.TestClass;
public class IsisSystemUsingInstallersWithinJunit extends IsisSystemUsingInstallers {
Modified: incubator/isis/trunk/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/pom.xml?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/pom.xml Mon Oct 18 18:30:03 2010
@@ -63,6 +63,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>defaults</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!--
unlike core, there's no need to list all the submodules because each
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/edit/Selector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/edit/Selector.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/edit/Selector.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/edit/Selector.java Mon Oct 18 18:30:03 2010
@@ -22,8 +22,8 @@ package org.apache.isis.webapp.view.edit
import java.util.Iterator;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.webapp.AbstractElementProcessor;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/form/InputForm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/form/InputForm.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/form/InputForm.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/form/InputForm.java Mon Oct 18 18:30:03 2010
@@ -20,7 +20,7 @@
package org.apache.isis.webapp.view.form;
-import org.apache.isis.metamodel.commons.exceptions.UnknownTypeException;
+import org.apache.isis.commons.exceptions.UnknownTypeException;
import org.apache.isis.webapp.processor.Request;
import org.apache.isis.webapp.view.display.Errors;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/simple/SetCookieFromField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/simple/SetCookieFromField.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/simple/SetCookieFromField.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/simple/SetCookieFromField.java Mon Oct 18 18:30:03 2010
@@ -20,7 +20,7 @@
package org.apache.isis.webapp.view.simple;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
import org.apache.isis.webapp.AbstractElementProcessor;
import org.apache.isis.webapp.processor.Request;
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/simple/SetFieldFromCookie.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/simple/SetFieldFromCookie.java?rev=1023938&r1=1023937&r2=1023938&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/simple/SetFieldFromCookie.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/simple/SetFieldFromCookie.java Mon Oct 18 18:30:03 2010
@@ -20,7 +20,7 @@
package org.apache.isis.webapp.view.simple;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
import org.apache.isis.webapp.AbstractElementProcessor;
import org.apache.isis.webapp.processor.Request;