You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/01/03 22:07:56 UTC
svn commit: r1226946 - in /karaf/webconsole/trunk: ./ assembly/
assembly/src/ assembly/src/main/ assembly/src/main/descriptors/
assembly/src/main/resources/ features/ features/src/main/filtered-resources/
Author: jbonofre
Date: Tue Jan 3 21:07:56 2012
New Revision: 1226946
URL: http://svn.apache.org/viewvc?rev=1226946&view=rev
Log:
Add source distributions for WebConsole and refactore features descriptors as others Karaf subprojects
Added:
karaf/webconsole/trunk/assembly/
karaf/webconsole/trunk/assembly/pom.xml
karaf/webconsole/trunk/assembly/src/
karaf/webconsole/trunk/assembly/src/main/
karaf/webconsole/trunk/assembly/src/main/descriptors/
karaf/webconsole/trunk/assembly/src/main/descriptors/unix-src.xml
karaf/webconsole/trunk/assembly/src/main/descriptors/windows-src.xml
karaf/webconsole/trunk/assembly/src/main/resources/
karaf/webconsole/trunk/assembly/src/main/resources/features.xml
- copied, changed from r1226705, karaf/webconsole/trunk/features/src/main/filtered-resources/features.xml
Removed:
karaf/webconsole/trunk/features/NOTICE
karaf/webconsole/trunk/features/pom.xml
karaf/webconsole/trunk/features/src/main/filtered-resources/features.xml
Modified:
karaf/webconsole/trunk/README
karaf/webconsole/trunk/pom.xml
Modified: karaf/webconsole/trunk/README
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/README?rev=1226946&r1=1226945&r2=1226946&view=diff
==============================================================================
--- karaf/webconsole/trunk/README (original)
+++ karaf/webconsole/trunk/README Tue Jan 3 21:07:56 2012
@@ -12,14 +12,14 @@ in your local .m2 repositories:
Instructions to build and deploy the project
-1) Download the code from : http://svn.apache.org/repos/asf/karaf/sandbox/pieber/karaf-webconsole/trunk
+1) Download the code from : http://svn.apache.org/repos/asf/karaf/webconsole/trunk webconsole
2) Build it : mvn clean install -Dtest=false
3) Download Karaf from here : https://repository.apache.org/content/repositories/releases/org/apache/karaf/apache-karaf/2.2.2/
4) Unzip/untar it and open a DOS/Unix shell
5) Go to bin directory and start Karaf bin/karaf.bat or bin/.karaf
6) Execute the following instructions :
-features:addurl mvn:org.apache.karaf.webconsole/features/1.0.0-SNAPSHOT/xml/features
+features:addurl mvn:org.apache.karaf.webconsole/apache-karaf-webconsole/0.3.0-SNAPSHOT/xml/features
features:install webconsole-wicket
7) Open cns website in your browser : http://localhost:8181/cns/
Added: karaf/webconsole/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/assembly/pom.xml?rev=1226946&view=auto
==============================================================================
--- karaf/webconsole/trunk/assembly/pom.xml (added)
+++ karaf/webconsole/trunk/assembly/pom.xml Tue Jan 3 21:07:56 2012
@@ -0,0 +1,127 @@
+<?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">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>webconsole</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>apache-karaf-webconsole</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: WebConsole :: Assembly</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ </configuration>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifact</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/features.xml</file>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>unix-src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <id>windows-src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/windows-src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Added: karaf/webconsole/trunk/assembly/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/assembly/src/main/descriptors/unix-src.xml?rev=1226946&view=auto
==============================================================================
--- karaf/webconsole/trunk/assembly/src/main/descriptors/unix-src.xml (added)
+++ karaf/webconsole/trunk/assembly/src/main/descriptors/unix-src.xml Tue Jan 3 21:07:56 2012
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+<assembly>
+
+ <id>src</id>
+
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <fileSets>
+
+ <!-- Binary files -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/*.jpeg</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.jar</include>
+ <include>**/*.keystore</include>
+ <include>**/*.cert</include>
+ </includes>
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Text files -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.cert</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.ipr</exclude>
+ </excludes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Added: karaf/webconsole/trunk/assembly/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/assembly/src/main/descriptors/windows-src.xml?rev=1226946&view=auto
==============================================================================
--- karaf/webconsole/trunk/assembly/src/main/descriptors/windows-src.xml (added)
+++ karaf/webconsole/trunk/assembly/src/main/descriptors/windows-src.xml Tue Jan 3 21:07:56 2012
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+<assembly>
+
+ <id>src</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+
+ <!-- Binary files -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/*.jpeg</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.jar</include>
+ <include>**/*.keystore</include>
+ <include>**/*.cert</include>
+ </includes>
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Text files -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.cert</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.ipr</exclude>
+ </excludes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Copied: karaf/webconsole/trunk/assembly/src/main/resources/features.xml (from r1226705, karaf/webconsole/trunk/features/src/main/filtered-resources/features.xml)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/assembly/src/main/resources/features.xml?p2=karaf/webconsole/trunk/assembly/src/main/resources/features.xml&p1=karaf/webconsole/trunk/features/src/main/filtered-resources/features.xml&r1=1226705&r2=1226946&rev=1226946&view=diff
==============================================================================
(empty)
Modified: karaf/webconsole/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/pom.xml?rev=1226946&r1=1226945&r2=1226946&view=diff
==============================================================================
--- karaf/webconsole/trunk/pom.xml (original)
+++ karaf/webconsole/trunk/pom.xml Tue Jan 3 21:07:56 2012
@@ -45,7 +45,6 @@
<module>core</module>
<module>osgi</module>
<module>karaf</module>
- <module>features</module>
<module>servicemix</module>
<module>camel</module>
<module>cxf</module>
@@ -53,6 +52,8 @@
<module>examples</module>
<module>manual</module>
<module>itest</module>
+
+ <module>assembly</module>
</modules>
<build>