You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/08/08 13:10:39 UTC
[1/2] git commit: Fixed services.xml of
org.apache.stratos.cartridge.agent component
Updated Branches:
refs/heads/master cc34c5fee -> 6f2c5ce52
Fixed services.xml of org.apache.stratos.cartridge.agent component
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/94c81954
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/94c81954
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/94c81954
Branch: refs/heads/master
Commit: 94c81954273d94eaef61e3f1d67a376607a15d42
Parents: cc34c5f
Author: Isuru Perera <is...@apache.org>
Authored: Thu Aug 8 16:39:26 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Thu Aug 8 16:39:26 2013 +0530
----------------------------------------------------------------------
.../src/main/resources/META-INF/services.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/94c81954/components/org.apache.stratos.cartridge.agent/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/resources/META-INF/services.xml b/components/org.apache.stratos.cartridge.agent/src/main/resources/META-INF/services.xml
index 1eb8777..6ecbd2c 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/resources/META-INF/services.xml
+++ b/components/org.apache.stratos.cartridge.agent/src/main/resources/META-INF/services.xml
@@ -25,7 +25,7 @@
<description>
Admin service for ADC activities
</description>
- <parameter name="ServiceClass">org.wso2.carbon.cartridge.agent.service.CartridgeAgentService
+ <parameter name="ServiceClass">org.apache.stratos.cartridge.agent.service.CartridgeAgentService
</parameter>
<parameter name="enableMTOM">true</parameter>
<parameter name="adminService" locked="true">false</parameter>
[2/2] git commit: Fixed Stratos Agent Distribution
Posted by is...@apache.org.
Fixed Stratos Agent Distribution
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6f2c5ce5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6f2c5ce5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6f2c5ce5
Branch: refs/heads/master
Commit: 6f2c5ce52a100fc981c5df05a6ddf7ef311f542b
Parents: 94c8195
Author: Isuru Perera <is...@apache.org>
Authored: Thu Aug 8 16:40:19 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Thu Aug 8 16:40:19 2013 +0530
----------------------------------------------------------------------
.../stratos-agent/modules/distribution/pom.xml | 15 ----
.../distribution/src/main/assembly/bin.xml | 14 +++-
.../distribution/src/main/assembly/dist.xml | 39 -----------
.../distribution/src/main/assembly/src.xml | 74 --------------------
4 files changed, 13 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6f2c5ce5/products/stratos-agent/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-agent/modules/distribution/pom.xml b/products/stratos-agent/modules/distribution/pom.xml
index 84ec9f9..5ec6551 100755
--- a/products/stratos-agent/modules/distribution/pom.xml
+++ b/products/stratos-agent/modules/distribution/pom.xml
@@ -515,21 +515,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>pre_dist</id>
- <phase>test</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <filters>
- <filter>${basedir}/src/main/assembly/filter.properties</filter>
- </filters>
- <descriptors>
- <descriptor>src/main/assembly/dist.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
<id>dist</id>
<phase>package</phase>
<goals>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6f2c5ce5/products/stratos-agent/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos-agent/modules/distribution/src/main/assembly/bin.xml b/products/stratos-agent/modules/distribution/src/main/assembly/bin.xml
index b6a1ac7..3c7b34f 100755
--- a/products/stratos-agent/modules/distribution/src/main/assembly/bin.xml
+++ b/products/stratos-agent/modules/distribution/src/main/assembly/bin.xml
@@ -46,9 +46,21 @@
<exclude>**/repository/components/plugins/*.ui*</exclude>
<exclude>**/log4j.properties</exclude>
<!--exclude>**/samples/*</exclude-->
+ <exclude>**/repository/components/**</exclude>
+ </excludes>
+ </fileSet>
+ <!-- Copying p2 profile and osgi bundles-->
+ <fileSet>
+ <directory>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
+ <outputDirectory>apache-stratos-agent-${pom.version}/repository/components</outputDirectory>
+ <excludes>
+ <exclude>**/eclipse.ini</exclude>
+ <exclude>**/*.lock</exclude>
+ <exclude>**/.data</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/synapse-samples*</exclude>
</excludes>
</fileSet>
-
<!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 -->
<fileSet>
<directory>../p2-profile/target/WSO2-CARBON-PATCH-4.1.0-0002/</directory>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6f2c5ce5/products/stratos-agent/modules/distribution/src/main/assembly/dist.xml
----------------------------------------------------------------------
diff --git a/products/stratos-agent/modules/distribution/src/main/assembly/dist.xml b/products/stratos-agent/modules/distribution/src/main/assembly/dist.xml
deleted file mode 100644
index 6cf1e9c..0000000
--- a/products/stratos-agent/modules/distribution/src/main/assembly/dist.xml
+++ /dev/null
@@ -1,39 +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>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <!-- Copying p2 profile and osgi bundles-->
- <fileSet>
- <directory>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
- <outputDirectory>apache-stratos-agent-${pom.version}/repository/components</outputDirectory>
- <excludes>
- <exclude>**/eclipse.ini</exclude>
- <exclude>**/*.lock</exclude>
- <exclude>**/.data</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/synapse-samples*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6f2c5ce5/products/stratos-agent/modules/distribution/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/products/stratos-agent/modules/distribution/src/main/assembly/src.xml b/products/stratos-agent/modules/distribution/src/main/assembly/src.xml
deleted file mode 100644
index 47d7876..0000000
--- a/products/stratos-agent/modules/distribution/src/main/assembly/src.xml
+++ /dev/null
@@ -1,74 +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>src</id>
- <includeBaseDirectory>false</includeBaseDirectory>
- <formats>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>target/sources</directory>
- <outputDirectory>apache-stratos-agent-${pom.version}-src</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../..</directory>
- <outputDirectory>apache-stratos-agent-${pom.version}-src</outputDirectory>
- <includes>
- <include>modules/**/*</include>
- <include>**/pom.xml</include>
- </includes>
- <excludes>
- <exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
- <exclude>**/build</exclude>
- <exclude>**/build/**/*</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.wtpmodules</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.settings/**/*</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- <files>
- <file>
- <source>../../LICENSE.txt</source>
- <outputDirectory>apache-stratos-agent-${pom.version}-src</outputDirectory>
- <filtered>true</filtered>
- </file>
- <file>
- <source>../../README.txt</source>
- <outputDirectory>apache-stratos-agent-${pom.version}-src</outputDirectory>
- <filtered>true</filtered>
- </file>
- <file>
- <source>../../INSTALL.txt</source>
- <outputDirectory>apache-stratos-agent-${pom.version}-src</outputDirectory>
- <filtered>true</filtered>
- </file>
- </files>
-</assembly>