Author: [email protected] Date: Tue Mar 15 13:34:19 2011 New Revision: 883
Log: AMDATU-138 removed hardcoded version number from resource Modified: trunk/amdatu-opensocial/dashboard/pom.xml trunk/amdatu-opensocial/dashboard/src/main/resources/jsp/dashboard.jsp trunk/changelog.txt trunk/readme.txt Modified: trunk/amdatu-opensocial/dashboard/pom.xml ============================================================================== --- trunk/amdatu-opensocial/dashboard/pom.xml (original) +++ trunk/amdatu-opensocial/dashboard/pom.xml Tue Mar 15 13:34:19 2011 @@ -1,5 +1,6 @@ <?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";> +<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</groupId> @@ -11,17 +12,33 @@ <packaging>bundle</packaging> <name>Amdatu Open Social - Dashboard</name> <description>Dashboard application (gadget container UI)</description> - - <dependencies> + + <dependencies> <dependency> <groupId>org.amdatu.web</groupId> <artifactId>httpcontext</artifactId> <scope>provided</scope> <type>bundle</type> - </dependency> + </dependency> </dependencies> - + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/dashboard.jsp</exclude> + </excludes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/dashboard.jsp</include> + </includes> + </resource> + </resources> <plugins> <plugin> <groupId>org.apache.felix</groupId> @@ -29,7 +46,7 @@ <configuration> <instructions> <Bundle-Activator>org.amdatu.opensocial.dashboard.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName> org.amdatu.opensocial.dashboard</Bundle-SymbolicName> + <Bundle-SymbolicName> org.amdatu.opensocial.dashboard</Bundle-SymbolicName> <Embed-Dependency>*;scope=compile</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> <Import-Package> @@ -43,7 +60,7 @@ </Import-Package> </instructions> </configuration> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> </project> Modified: trunk/amdatu-opensocial/dashboard/src/main/resources/jsp/dashboard.jsp ============================================================================== --- trunk/amdatu-opensocial/dashboard/src/main/resources/jsp/dashboard.jsp (original) +++ trunk/amdatu-opensocial/dashboard/src/main/resources/jsp/dashboard.jsp Tue Mar 15 13:34:19 2011 @@ -51,7 +51,7 @@ </div> <div id="footer"> - Amdatu 0.2.0-SNAPSHOT - 2011 - <a href="http://amdatu.org";>http://amdatu.org</a> + Amdatu ${project.version} - 2011 - <a href="http://amdatu.org";>http://amdatu.org</a> </div> </div> Modified: trunk/changelog.txt ============================================================================== --- trunk/changelog.txt (original) +++ trunk/changelog.txt Tue Mar 15 13:34:19 2011 @@ -3,8 +3,7 @@ Amdatu -Release 0.2.0-SNAPSHOT -Last revised March 10, 2011 +Release ${project.version} --------------------------- The changelog below is automatically generated from JIRA. More information about the resolved Modified: trunk/readme.txt ============================================================================== --- trunk/readme.txt (original) +++ trunk/readme.txt Tue Mar 15 13:34:19 2011 @@ -4,8 +4,7 @@ Amdatu -Release 0.2.0-SNAPSHOT -Last revised March 10, 2011 +Release ${project.version} ----------------------------- =================================================================================================== _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
