Skip to content
Browse files

- cleaning

  • Loading branch information...
1 parent 10265f9 commit 5a79529dcf4806859bd0cb10326e9e56365c01fc Arnaud Lemaire committed Dec 20, 2011
View
3 .gitignore
@@ -11,6 +11,3 @@ jwall-database.log
.checkstyle
.metadata
ucdetector_reports
-/component/*/META-INF
-/plugins/*/META-INF
-component/web/src/main/webapp/WEB-INF/karaf/
View
45 component/web/pom.xml
@@ -179,16 +179,6 @@
<scope>provided</scope>
</dependency>
- <!-- OSGI -->
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <version>${karaf.version}</version>
- <type>zip</type>
- <scope>provided</scope>
- </dependency>
-
-
<!-- Test -->
<dependency>
<groupId>junit</groupId>
@@ -237,41 +227,6 @@
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bootstrap-MainClass>net.awired.visuwall.cli.Main</Bootstrap-MainClass>
- <VisuwallVersion>${project.version}</VisuwallVersion>
- </instructions>
- </configuration>
- </plugin>
-
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>aggregate</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptor>src/main/assembly/default.xml</descriptor>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <attach>false</attach>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.3</version>
View
41 component/web/src/main/assembly/default.xml
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd ">
- <id>default</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>/WEB-INF/karaf/deploy</outputDirectory>
- <includes>
- <include>net.awired.visuwall:visuwall-osgi</include>
- </includes>
- <useProjectArtifact>false</useProjectArtifact>
- <useProjectAttachments>true</useProjectAttachments>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/WEB-INF/karaf/deploy</outputDirectory>
- <includes>
-<!-- <include>net.awired.visuwall:visuwall-api</include> -->
- <include>org.slf4j:jcl-over-slf4j</include>
- <include>org.slf4j:slf4j-api</include>
- <include>ch.qos.logback:logback-classic</include>
- <include>commons-lang:commons-lang</include>
- <include>com.google.guava:guava</include>
- <include>org.codehaus.jackson:jackson-mapper-asl</include>
- </includes>
- <scope>runtime</scope>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- </dependencySet>
- </dependencySets>
-</assembly>
View
22 component/web/src/main/karaf/etc/org.apache.felix.fileinstall-visuwall.cfg
@@ -1,22 +0,0 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
-felix.fileinstall.dir = ${VISUWALL_HOME}/karaf/deploy
-felix.fileinstall.tmpdir = ${VISUWALL_HOME}/karaf/data/generated-bundles
-felix.fileinstall.poll = 1000
View
13 plugins/bamboo-plugin/pom.xml
@@ -59,19 +59,6 @@
<build>
<plugins>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>net.awired.visuwall.plugin.bamboo.BambooPluginActivator</Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
-
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
View
25 plugins/continuum-plugin/pom.xml
@@ -28,6 +28,12 @@
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-xmlrpc-client</artifactId>
<version>1.4.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
@@ -62,25 +68,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>net.awired.visuwall.plugin.continuum.ContinuumPluginActivator</Bundle-Activator>
- <Import-Package>
- org.apache.maven.continuum.xmlrpc,
- org.apache.maven.continuum.xmlrpc.project.*,
- org.apache.continuum.xmlrpc.repository,
- org.apache.maven.continuum.xmlrpc.system,
- org.apache.continuum.xmlrpc.release,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
-
</plugins>
</build>
</project>
View
11 plugins/cruisecontrol-plugin/pom.xml
@@ -51,17 +51,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>net.awired.visuwall.plugin.cruisecontrol.CruiseControlPluginActivator</Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
-
</plugins>
</build>
</project>
View
32 .../src/main/java/net/awired/visuwall/plugin/cruisecontrol/CruiseControlPluginActivator.java
@@ -1,32 +0,0 @@
-package net.awired.visuwall.plugin.cruisecontrol;
-
-import java.util.Properties;
-
-import net.awired.visuwall.api.plugin.VisuwallPlugin;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-public class CruiseControlPluginActivator implements BundleActivator {
-
- private CruiseControlPlugin cruiseControlPlugin;
- private ServiceRegistration registration;
-
- public CruiseControlPluginActivator() {
- cruiseControlPlugin = new CruiseControlPlugin();
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- registration = context.registerService(VisuwallPlugin.class.getName(), cruiseControlPlugin, new Properties());
- System.out.println("CruiseControl plugin successfully loaded.");
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- registration.unregister();
- cruiseControlPlugin = null;
- System.out.println("CruiseControl plugin successfully unloaded.");
- }
-}
View
44 .../test/java/net/awired/visuwall/plugin/cruisecontrol/CruiseControlPluginActivatorTest.java
@@ -1,44 +0,0 @@
-package net.awired.visuwall.plugin.cruisecontrol;
-
-import static org.mockito.Mockito.verify;
-
-import java.util.Properties;
-
-import net.awired.visuwall.api.plugin.VisuwallPlugin;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-@RunWith(MockitoJUnitRunner.class)
-public class CruiseControlPluginActivatorTest {
-
- @InjectMocks
- CruiseControlPluginActivator activator;
-
- @Mock
- CruiseControlPlugin plugin;
-
- @Mock
- ServiceRegistration registration;
-
- @Mock
- BundleContext context;
-
- @Test
- public void should_start_activator() throws Exception {
- activator.start(context);
- verify(context).registerService(VisuwallPlugin.class.getName(), plugin, new Properties());
- }
-
- @Test
- public void should_stop_activator() throws Exception {
- activator.stop(context);
- verify(registration).unregister();
- }
-
-}
View
10 plugins/hudson-plugin/pom.xml
@@ -65,16 +65,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>net.awired.visuwall.plugin.hudson.HudsonPluginActivator</Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
View
12 plugins/jenkins-plugin/pom.xml
@@ -68,18 +68,6 @@
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>net.awired.visuwall.plugin.jenkins.JenkinsPluginActivator</Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
-
-
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.3.1</version>
View
10 plugins/sonar-plugin/pom.xml
@@ -54,16 +54,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>net.awired.visuwall.plugin.sonar.SonarPluginActivator</Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
View
12 plugins/teamcity-plugin/pom.xml
@@ -65,18 +65,6 @@
<build>
<plugins>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>net.awired.visuwall.plugin.teamcity.TeamCityPluginActivator</Bundle-Activator>
- </instructions>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
View
3 pom.xml
@@ -49,9 +49,6 @@
<jackson.version>1.8.5</jackson.version>
<jetty.version>6.1.26</jetty.version>
-
-
- <karaf.version>2.2.2</karaf.version>
<guava.version>r09</guava.version>
<junit.version>4.8.2</junit.version>
<jersey.client.version>1.4</jersey.client.version>

0 comments on commit 5a79529

Please sign in to comment.
Something went wrong with that request. Please try again.