Move to Commons Base
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 17 Jul 2012 12:28:23 +0000 (12:28 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 17 Jul 2012 12:28:23 +0000 (12:28 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@5473 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

base/dep/org.argeo.eclipse.dep.rap/p2.inf [new file with mode: 0644]
base/dep/org.argeo.eclipse.dep.rap/pom.xml [new file with mode: 0644]
eclipse/dep/org.argeo.eclipse.dep.rap/p2.inf [deleted file]
eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml [deleted file]

diff --git a/base/dep/org.argeo.eclipse.dep.rap/p2.inf b/base/dep/org.argeo.eclipse.dep.rap/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
diff --git a/base/dep/org.argeo.eclipse.dep.rap/pom.xml b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
new file mode 100644 (file)
index 0000000..e2f81dc
--- /dev/null
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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>
+       <parent>
+               <groupId>org.argeo.commons.eclipse</groupId>
+               <artifactId>dep</artifactId>
+               <version>1.1.4-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.eclipse.dep.rap</artifactId>
+       <name>Commons Eclipse RAP Dependencies</name>
+       <properties>
+               <version.rap>1.3.2</version.rap>
+       </properties>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <artifactId>binaries</artifactId>
+                       <version>${version.argeo-distribution}</version>
+                       <type>pom</type>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>javax.servlet</artifactId>
+                               </exclusion>
+
+                               <!-- Jetty -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.equinox.http.jetty</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.mortbay.jetty.server</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.mortbay.jetty.util</artifactId>
+                               </exclusion>
+
+                               <!-- Demo -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.rap.demo</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.rap.demo.databinding</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.rap.platform</groupId>
+                                       <artifactId>org.eclipse.rap.design.example</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+
+               <!-- Dependency to enable file upload. Should be included directly in coming 
+                       rap distribution -->
+               <dependency>
+                       <groupId>org.argeo.tp.rap</groupId>
+                       <artifactId>org.eclipse.rwt.widgets.upload</artifactId>
+               </dependency>
+               <!-- Needed by the bundle above -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.io</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.fileupload</artifactId>
+               </dependency>
+
+               <!-- RAP Specific Dependencies -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.servlet</artifactId>
+               </dependency>
+
+               <!-- Security -->
+               <dependency>
+                       <groupId>org.argeo.tp.rap</groupId>
+                       <artifactId>org.eclipse.equinox.security</artifactId>
+               </dependency>
+
+       </dependencies>
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.argeo.tp.rap</groupId>
+                               <artifactId>binaries</artifactId>
+                               <version>${version.argeo-distribution}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.tp.rap.platform</groupId>
+                               <artifactId>binaries</artifactId>
+                               <version>${version.argeo-distribution}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+       <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-rap</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>eclipse-rap</name>
+                                                                       <projversion>${version.rap}</projversion>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/eclipse-rap</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <dependency />
+                                                                               </mapping>
+                                                                       </mappings>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
+                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+</project>
\ No newline at end of file
diff --git a/eclipse/dep/org.argeo.eclipse.dep.rap/p2.inf b/eclipse/dep/org.argeo.eclipse.dep.rap/p2.inf
deleted file mode 100644 (file)
index 0423aa5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file
diff --git a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
deleted file mode 100644 (file)
index e2f81dc..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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>
-       <parent>
-               <groupId>org.argeo.commons.eclipse</groupId>
-               <artifactId>dep</artifactId>
-               <version>1.1.4-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.eclipse.dep.rap</artifactId>
-       <name>Commons Eclipse RAP Dependencies</name>
-       <properties>
-               <version.rap>1.3.2</version.rap>
-       </properties>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.tp.rap.platform</groupId>
-                       <artifactId>binaries</artifactId>
-                       <version>${version.argeo-distribution}</version>
-                       <type>pom</type>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>javax.servlet</artifactId>
-                               </exclusion>
-
-                               <!-- Jetty -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.equinox.http.jetty</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.mortbay.jetty.server</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.mortbay.jetty.util</artifactId>
-                               </exclusion>
-
-                               <!-- Demo -->
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.demo</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.demo.databinding</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.rap.platform</groupId>
-                                       <artifactId>org.eclipse.rap.design.example</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-
-               <!-- Dependency to enable file upload. Should be included directly in coming 
-                       rap distribution -->
-               <dependency>
-                       <groupId>org.argeo.tp.rap</groupId>
-                       <artifactId>org.eclipse.rwt.widgets.upload</artifactId>
-               </dependency>
-               <!-- Needed by the bundle above -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.commons.io</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.apache.commons.fileupload</artifactId>
-               </dependency>
-
-               <!-- RAP Specific Dependencies -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>javax.servlet</artifactId>
-               </dependency>
-
-               <!-- Security -->
-               <dependency>
-                       <groupId>org.argeo.tp.rap</groupId>
-                       <artifactId>org.eclipse.equinox.security</artifactId>
-               </dependency>
-
-       </dependencies>
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.argeo.tp.rap</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.argeo-distribution}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.tp.rap.platform</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.argeo-distribution}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       <profiles>
-               <profile>
-                       <id>check-osgi</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.argeo.maven.plugins</groupId>
-                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>check-osgi</id>
-                                                               <phase>test</phase>
-                                                               <goals>
-                                                                       <goal>equinox</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <onlyCheck>true</onlyCheck>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-               <profile>
-                       <id>rpmbuild-tp</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>rpm-maven-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>rpm-rap</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>eclipse-rap</name>
-                                                                       <projversion>${version.rap}</projversion>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/eclipse-rap</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <dependency />
-                                                                               </mapping>
-                                                                       </mappings>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                                       <plugin>
-                                               <artifactId>maven-antrun-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <phase>install</phase>
-                                                               <goals>
-                                                                       <goal>run</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <target>
-                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
-                                                                                       <flattenmapper />
-                                                                               </copy>
-                                                                       </target>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-</project>
\ No newline at end of file