[forceTen-commits] [forceten~src:1782] Fixed examples pom.

[fabriziogiudici@kenai.com]

Project:    forceten
Repository: src
Revision:   1782
Author:     fabriziogiudici
Date:       2011-02-28 18:50:28 UTC
Link:       

Log Message:
------------
Fixed examples pom.


Revisions:
----------
1782


Modified Paths:
---------------
examples/example1/branding/pom.xml
examples/example1/pom.xml
examples/example2/pom.xml


Diffs:
------
diff -r 5bc6d58365ce -r ba65a767cf8a examples/example1/branding/pom.xml
--- a/examples/example1/branding/pom.xml        Mon Feb 28 18:49:25 2011 +0100
+++ b/examples/example1/branding/pom.xml        Mon Feb 28 19:50:28 2011 +0100
@@ -1,29 +1,32 @@
 <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>it.tidalwave.geo.examples</groupId>
       <artifactId>example1</artifactId>
       <version>1.24-SNAPSHOT</version>
+      <relativePath>..</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+
   <artifactId>branding</artifactId>
   <packaging>nbm</packaging>
   <version>1.24-SNAPSHOT</version>
   <name>forceTen Example1 - Platform application branding resources</name>
+
   <dependencies>
-    <dependency>
-      <groupId>org.netbeans.api</groupId>
-      <artifactId>org-openide-util</artifactId>
-      <version>${netbeans.version}</version>
-    </dependency>
+      <dependency>
+         <groupId>org.netbeans.api</groupId>
+         <artifactId>org-openide-util</artifactId>
+         <version>${netbeans.version}</version>
+      </dependency>
   </dependencies>
+
   <build>
       <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>nbm-maven-plugin</artifactId>
-                <configuration>
-                    <brandingToken>example2</brandingToken>
-                </configuration>
                 <executions>
                     <execution>
                         <id>branding</id>

diff -r 5bc6d58365ce -r ba65a767cf8a examples/example1/pom.xml
--- a/examples/example1/pom.xml Mon Feb 28 18:49:25 2011 +0100
+++ b/examples/example1/pom.xml Mon Feb 28 19:50:28 2011 +0100
@@ -2,12 +2,6 @@
 <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>it.tidalwave.superpom</groupId>
-        <artifactId>superpom</artifactId>
-        <version>1.0.9-SNAPSHOT</version>
-    </parent>
-
     <groupId>it.tidalwave.geo.examples</groupId>
     <artifactId>example1</artifactId>
     <packaging>pom</packaging>
@@ -43,7 +37,7 @@
         <openbluesky.version>0.9.0-SNAPSHOT</openbluesky.version>
         
<thesefoolishthings.version>1.9.0-SNAPSHOT</thesefoolishthings.version>
         <netbeans.version>RELEASE68</netbeans.version>
-        <brandingToken>forceten_example1</brandingToken>
+        <netbeans.brandingToken>forceten_example1</netbeans.brandingToken>
     </properties>
     
     <!-- FIXME: Even though this module disables deployment, the plugin 
still fails without this configuration -->
@@ -149,11 +143,11 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>nbm-maven-plugin</artifactId>
-                    <version>3.4</version>
+                    <version>3.5</version>
                     <extensions>true</extensions>
                     <configuration>
                         <descriptor>src/main/nbm/module.xml</descriptor>
-                        <brandingToken>${brandingToken}</brandingToken>
+                        
<brandingToken>${netbeans.brandingToken}</brandingToken>
                         <cluster>forceten_example1</cluster>
                     </configuration>
                 </plugin>

diff -r 5bc6d58365ce -r ba65a767cf8a examples/example2/pom.xml
--- a/examples/example2/pom.xml Mon Feb 28 18:49:25 2011 +0100
+++ b/examples/example2/pom.xml Mon Feb 28 19:50:28 2011 +0100
@@ -1,6 +1,7 @@
 <?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/xsd/maven-4.0.0.xsd";>
     <modelVersion>4.0.0</modelVersion>
+
     <groupId>it.tidalwave.geo.examples</groupId>
     <artifactId>example2</artifactId>
     <version>1.6-SNAPSHOT</version>