brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjcorb...@apache.org
Subject [4/9] incubator-brooklyn git commit: Revert "Standalone console dependency"
Date Thu, 15 Jan 2015 14:59:58 GMT
Revert "Standalone console dependency"

This reverts commit 587ceb4aa33dbe70ebdc4ab259d12c2e60994f2c.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4c6dfea9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4c6dfea9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4c6dfea9

Branch: refs/heads/master
Commit: 4c6dfea912bf3db905e50c8318ca678f80939d50
Parents: 8698258
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Wed Jan 14 21:49:57 2015 +0200
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Wed Jan 14 21:49:57 2015 +0200

----------------------------------------------------------------------
 usage/jsgui/pom.xml                        | 17 ------------
 usage/jsgui/src/main/assembly/assembly.xml | 33 -----------------------
 usage/launcher/pom.xml                     | 35 ++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c6dfea9/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index d4d5e02..20e760e 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -147,23 +147,6 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>assemble-jsgui</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/assembly.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
             <!--
                  run js tests with: $ mvn clean process-resources jasmine:test
                  run tests in the browser with: $ mvn jasmine:bdd

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c6dfea9/usage/jsgui/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/assembly/assembly.xml b/usage/jsgui/src/main/assembly/assembly.xml
deleted file mode 100644
index 54c449c..0000000
--- a/usage/jsgui/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you 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.
--->
-<assembly>
-    <id>war</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <files>
-        <file>
-            <source>target/${artifactId}-${version}.war</source>
-            <outputDirectory />
-            <destName>brooklyn.war</destName>
-        </file>
-    </files>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4c6dfea9/usage/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index 2800249..16a5bbf 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -77,12 +77,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.brooklyn</groupId>
-            <artifactId>brooklyn-jsgui</artifactId>
-            <version>${project.version}</version>
-            <classifier>war</classifier>
-        </dependency>
-        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
         </dependency>
@@ -222,10 +216,39 @@
     <build>
         <plugins>
             <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <!-- copy the WAR so it is available on the classpath for programmatic
deployment -->
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <!-- this can fail in eclipse trying to copy _from_
target/classes.
+                                         see http://jira.codehaus.org/browse/MDEP-259 -->
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>brooklyn-jsgui</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>target/classes</outputDirectory>
+                                    <destFileName>brooklyn.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Include-Resource>{maven-resources}, target/classes/brooklyn.war</Include-Resource>
                         <Bundle-Activator>brooklyn.launcher.Activator</Bundle-Activator>
                         <Main-class>brooklyn.launcher.Main</Main-class>
                     </instructions>


Mime
View raw message