Skip to content

Commit

Permalink
Move standard library.
Browse files Browse the repository at this point in the history
  • Loading branch information
Curtiss Howard committed Jul 19, 2011
1 parent 9756211 commit 5a1f38a
Show file tree
Hide file tree
Showing 113 changed files with 245 additions and 270 deletions.
47 changes: 38 additions & 9 deletions dojoserverfaces-core/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?><!--
Copyright (c) 2011, The Dojo Foundation All Rights Reserved.
Available via Academic Free License >= 2.1 OR the modified BSD license.
see: http://dojotoolkit.org/license for details
Copyright (c) 2011, The Dojo Foundation All Rights Reserved.
Available via Academic Free License >= 2.1 OR the modified BSD license.
see: http://dojotoolkit.org/license for details
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
Expand All @@ -27,14 +27,14 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-annotations</artifactId>
<version>${project.version}</version>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-annotations</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-constants</artifactId>
<version>${project.version}</version>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-constants</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -68,6 +68,35 @@
</execution>
</executions>
</plugin>

<!-- Include constants in the core JAR without using an assembly. -->

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<id>unpack</id>
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-constants</artifactId>
<version>${project.version}</version>
<type>jar</type>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<includes>**/*</includes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Expand Up @@ -9,13 +9,13 @@
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>org.dojoserverfaces</groupId>
<artifactId>dojoserverfaces-library-definition</artifactId>
<artifactId>dojoserverfaces-library-standard</artifactId>
<packaging>jar</packaging>
<name>DojoServerFaces - Library Definition</name>
<name>DojoServerFaces - Library (Standard)</name>

<parent>
<groupId>org.dojoserverfaces</groupId>
<artifactId>dojoserverfaces</artifactId>
<artifactId>dojoserverfaces-libraries</artifactId>
<version>1.0.0</version>
</parent>

Expand Down
25 changes: 25 additions & 0 deletions dojoserverfaces-libraries/pom.xml
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?><!--
Copyright (c) 2011, The Dojo Foundation All Rights Reserved.
Available via Academic Free License >= 2.1 OR the modified BSD license.
see: http://dojotoolkit.org/license for details
-->

<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>org.dojoserverfaces</groupId>
<artifactId>dojoserverfaces-libraries</artifactId>
<packaging>pom</packaging>
<name>DojoServerFaces - Libraries</name>

<parent>
<groupId>org.dojoserverfaces</groupId>
<artifactId>dojoserverfaces</artifactId>
<version>1.0.0</version>
</parent>

<modules>
<module>dojoserverfaces-library-standard</module>
</modules>
</project>
3 changes: 0 additions & 3 deletions dojoserverfaces-library-assembly/META-INF/MANIFEST.MF

This file was deleted.

57 changes: 0 additions & 57 deletions dojoserverfaces-library-assembly/pom.xml

This file was deleted.

22 changes: 0 additions & 22 deletions dojoserverfaces-library-assembly/src/main/assembly/assembly.xml

This file was deleted.

4 changes: 2 additions & 2 deletions dojoserverfaces-library-example/pom.xml
Expand Up @@ -17,7 +17,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-library-assembly</artifactId>
<artifactId>dojoserverfaces-library-standard</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
Expand All @@ -36,7 +36,7 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
<configuration>
<packagingExcludes>WEB-INF/lib/dojoserverfaces-annotations-1.0.0.jar,WEB-INF/lib/dojoserverfaces-dojo-1.0.0.jar,WEB-INF/lib/dojoserverfaces-core-1.0.0.jar,WEB-INF/lib/dojoserverfaces-library-definition-1.0.0.jar</packagingExcludes>
<packagingExcludes>WEB-INF/lib/dojoserverfaces-annotations-${project.version}.jar,WEB-INF/lib/dojoserverfaces-constants-${project.version}.jar</packagingExcludes>
</configuration>
</plugin>
</plugins>
Expand Down
120 changes: 60 additions & 60 deletions dojoserverfaces-library-showcase/pom.xml
@@ -1,66 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?><!-- Copyright (c) 2011, The Dojo Foundation
All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified
BSD license. see: http://dojotoolkit.org/license for details -->
All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified
BSD license. see: http://dojotoolkit.org/license for details -->

<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.dojoserverfaces</groupId>
<artifactId>dojoserverfaces-library-showcase</artifactId>
<version>1.0.0</version>
<packaging>war</packaging>
<name>DojoServerFaces - Library Showcase App</name>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.dojoserverfaces</groupId>
<artifactId>dojoserverfaces-library-showcase</artifactId>
<version>1.0.0</version>
<packaging>war</packaging>
<name>DojoServerFaces - Library Showcase App</name>

<parent>
<artifactId>dojoserverfaces</artifactId>
<groupId>org.dojoserverfaces</groupId>
<version>1.0.0</version>
</parent>
<parent>
<artifactId>dojoserverfaces</artifactId>
<groupId>org.dojoserverfaces</groupId>
<version>1.0.0</version>
</parent>

<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-library-assembly</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-server</artifactId>
<version>1.1.3-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-dojo</artifactId>
<version>${project.version}</version>
<type>war</type>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
<configuration>
<packagingExcludes>WEB-INF/lib/dojoserverfaces-annotations-1.0.0.jar,WEB-INF/lib/dojoserverfaces-core-1.0.0.jar,WEB-INF/lib/dojoserverfaces-library-definition-1.0.0.jar</packagingExcludes>
<overlays>
<overlay>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-dojo</artifactId>
</overlay>
</overlays>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>6.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-library-standard</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-server</artifactId>
<version>1.1.3-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-dojo</artifactId>
<version>${project.version}</version>
<type>war</type>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
<configuration>
<packagingExcludes>WEB-INF/lib/dojoserverfaces-annotations-${project.version}.jar,WEB-INF/lib/dojoserverfaces-constants-${project.version}.jar</packagingExcludes>
<overlays>
<overlay>
<groupId>${project.groupId}</groupId>
<artifactId>dojoserverfaces-dojo</artifactId>
</overlay>
</overlays>
</configuration>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 5a1f38a

Please sign in to comment.