Author: [email protected] Date: Wed Oct 26 15:01:31 2011 New Revision: 1658 Log: [Amdatu release]prepare branch amdatu-auth-0.2.1
Modified: trunk/amdatu-auth/login-gadget/pom.xml trunk/amdatu-auth/pom.xml trunk/amdatu-auth/release/pom.xml trunk/amdatu-auth/test-integration/tests/pom.xml trunk/amdatu-auth/useradmin-gadget/pom.xml Modified: trunk/amdatu-auth/login-gadget/pom.xml ============================================================================== --- trunk/amdatu-auth/login-gadget/pom.xml (original) +++ trunk/amdatu-auth/login-gadget/pom.xml Wed Oct 26 15:01:31 2011 @@ -1,124 +1,124 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2010, 2011 The Amdatu Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License.verning permissions and limitations - under the License. ---> -<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.amdatu.auth</groupId> - <artifactId>org.amdatu.auth</artifactId> - <version>0.2.1-SNAPSHOT</version> - </parent> - <artifactId>org.amdatu.auth.login.gadget</artifactId> - <packaging>bundle</packaging> - <name>Amdatu Auth - Login gadget</name> - <description>Provides a login gadget</description> - - <properties> - <amdatu.opensocial.version>0.2.0-RC1</amdatu.opensocial.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.amdatu.auth</groupId> - <artifactId>org.amdatu.auth.login.service</artifactId> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.web</groupId> - <artifactId>org.amdatu.web.dispatcher</artifactId> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.web</groupId> - <artifactId>org.amdatu.web.httpcontext</artifactId> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.web</groupId> - <artifactId>org.amdatu.web.jsp</artifactId> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.web</groupId> - <artifactId>org.amdatu.web.resource</artifactId> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.core</groupId> - <artifactId>org.amdatu.core.tenant</artifactId> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.opensocial</groupId> - <artifactId>org.amdatu.opensocial.shindig</artifactId> - <version>${amdatu.opensocial.version}</version> - <scope>provided</scope> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.opensocial</groupId> - <artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId> - <version>${amdatu.opensocial.version}</version> - <scope>provided</scope> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.auth.login.gadget.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - <Export-Package></Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <!-- Profile that will copy the jar to the configured amdatu.deploy.directory when - the deploy profile is activated --> - <id>deploy</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2010, 2011 The Amdatu Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.verning permissions and limitations + under the License. +--> +<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.amdatu.auth</groupId> + <artifactId>org.amdatu.auth</artifactId> + <version>0.2.1-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.auth.login.gadget</artifactId> + <packaging>bundle</packaging> + <name>Amdatu Auth - Login gadget</name> + <description>Provides a login gadget</description> + + <properties> + <amdatu.opensocial.version>0.2.0-RC1</amdatu.opensocial.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.login.service</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.dispatcher</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.httpcontext</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.jsp</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.resource</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core.tenant</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.opensocial</groupId> + <artifactId>org.amdatu.opensocial.shindig</artifactId> + <version>${amdatu.opensocial.version}</version> + <scope>provided</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.opensocial</groupId> + <artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId> + <version>${amdatu.opensocial.version}</version> + <scope>provided</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.auth.login.gadget.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Export-Package /> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <!-- Profile that will copy the jar to the configured amdatu.deploy.directory when + the deploy profile is activated --> + <id>deploy</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Modified: trunk/amdatu-auth/pom.xml ============================================================================== --- trunk/amdatu-auth/pom.xml (original) +++ trunk/amdatu-auth/pom.xml Wed Oct 26 15:01:31 2011 @@ -38,9 +38,9 @@ </properties> <scm> - <connection>scm:svn:http://subversion.amdatu.org/svn/amdatu/trunk/amdatu-auth</connection> - <developerConnection>scm:svn:http://subversion.amdatu.org/svn/amdatu/trunk/amdatu-auth</developerConnection> - <url>http://subversion.amdatu.org/viewvc/amdatu/amdatu-auth</url> + <connection>scm:svn:http://subversion.amdatu.org/svn/amdatu/branches/amdatu-auth-0.2.1</connection> + <developerConnection>scm:svn:http://subversion.amdatu.org/svn/amdatu/branches/amdatu-auth-0.2.1</developerConnection> + <url>http://subversion.amdatu.org/svn/amdatu/branches/amdatu-auth-0.2.1</url> </scm> <repositories> Modified: trunk/amdatu-auth/release/pom.xml ============================================================================== --- trunk/amdatu-auth/release/pom.xml (original) +++ trunk/amdatu-auth/release/pom.xml Wed Oct 26 15:01:31 2011 @@ -15,8 +15,7 @@ limitations under the License.verning permissions and limitations under the License. --> -<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";> +<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.amdatu.auth</groupId> Modified: trunk/amdatu-auth/test-integration/tests/pom.xml ============================================================================== --- trunk/amdatu-auth/test-integration/tests/pom.xml (original) +++ trunk/amdatu-auth/test-integration/tests/pom.xml Wed Oct 26 15:01:31 2011 @@ -15,8 +15,7 @@ limitations under the License.verning permissions and limitations under the License. --> -<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";> +<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.amdatu.auth</groupId> Modified: trunk/amdatu-auth/useradmin-gadget/pom.xml ============================================================================== --- trunk/amdatu-auth/useradmin-gadget/pom.xml (original) +++ trunk/amdatu-auth/useradmin-gadget/pom.xml Wed Oct 26 15:01:31 2011 @@ -1,122 +1,122 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2010, 2011 The Amdatu Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License.verning permissions and limitations - under the License. ---> -<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.amdatu.auth</groupId> - <artifactId>org.amdatu.auth</artifactId> - <version>0.2.1-SNAPSHOT</version> - </parent> - <artifactId>org.amdatu.auth.useradmin.gadget</artifactId> - <packaging>bundle</packaging> - <name>Amdatu Auth - User Admin Gadget</name> - <description>Provides a UserAdmin gadget to manage users and groups</description> - - <properties> - <amdatu.opensocial.version>0.2.0-RC1</amdatu.opensocial.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.amdatu.web</groupId> - <artifactId>org.amdatu.web.dispatcher</artifactId> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.web</groupId> - <artifactId>org.amdatu.web.httpcontext</artifactId> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.web</groupId> - <artifactId>org.amdatu.web.jsp</artifactId> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.web</groupId> - <artifactId>org.amdatu.web.resource</artifactId> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.core</groupId> - <artifactId>org.amdatu.core.tenant</artifactId> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.opensocial</groupId> - <artifactId>org.amdatu.opensocial.shindig</artifactId> - <version>${amdatu.opensocial.version}</version> - <scope>provided</scope> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.opensocial</groupId> - <artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId> - <version>${amdatu.opensocial.version}</version> - <scope>provided</scope> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.auth.useradmin.gadget.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Import-Package> - org.amdatu.opensocial.gadgetmanagement, - * - </Import-Package> - <Export-Package></Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <!-- Profile that will copy the jar to the configured amdatu.deploy.directory when - the deploy profile is activated --> - <id>deploy</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2010, 2011 The Amdatu Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.verning permissions and limitations + under the License. +--> +<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.amdatu.auth</groupId> + <artifactId>org.amdatu.auth</artifactId> + <version>0.2.1-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.auth.useradmin.gadget</artifactId> + <packaging>bundle</packaging> + <name>Amdatu Auth - User Admin Gadget</name> + <description>Provides a UserAdmin gadget to manage users and groups</description> + + <properties> + <amdatu.opensocial.version>0.2.0-RC1</amdatu.opensocial.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.dispatcher</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.httpcontext</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.jsp</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.resource</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core.tenant</artifactId> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.opensocial</groupId> + <artifactId>org.amdatu.opensocial.shindig</artifactId> + <version>${amdatu.opensocial.version}</version> + <scope>provided</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.opensocial</groupId> + <artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId> + <version>${amdatu.opensocial.version}</version> + <scope>provided</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.auth.useradmin.gadget.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Import-Package> + org.amdatu.opensocial.gadgetmanagement, + * + </Import-Package> + <Export-Package /> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <!-- Profile that will copy the jar to the configured amdatu.deploy.directory when + the deploy profile is activated --> + <id>deploy</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
