Skip to content

GitLab

F
frascati
Commit 86c88dd2 authored by Munilla Christophe's avatar Munilla Christophe
Browse files
Options

fix frascati-nuxeo module issue : remove unnecessary dependencies and exclude the unresolved ones 

trial fix LightTest issue : change port to evaluate whether it is already used by another application
cosmetic : add some headers - rename getFraSCAtiService method to getFraSCAtiNuxeoService
parent 70392c9b
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 52 deletions
demo/common/common-homeautomation/common-homeautomation-light/src/main/resources/light.composite
View file @ 86c88dd2
......@@ -55,7 +55,7 @@
</component>
<service name="onoffdim-actuator" promote="light/onoffdim-actuator">
<binding.ws uri="http://localhost:9103/light/onoffdim"/>
<binding.ws uri="http://localhost:9113/light/onoffdim"/>
</service>
</composite>
\ No newline at end of file
demo/common/common-homeautomation/common-homeautomation-light/src/test/java/org/ow2/frascati/ligthTest/LigthTest.java
View file @ 86c88dd2
......@@ -28,7 +28,6 @@
package org.ow2.frascati.ligthTest;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
......@@ -66,6 +65,7 @@ public class LigthTest extends FraSCAtiTestCase
public void init() throws FrascatiException
{
fraSCAti=FraSCAti.newFraSCAti();
try
{
ClassLoaderManager classLoaderManager = fraSCAti.getClassLoaderManager();
......@@ -74,6 +74,7 @@ public class LigthTest extends FraSCAtiTestCase
"target/dependency/common-homeautomation-zibase-0.0.1-SNAPSHOT.jar").toURI().toURL());
CompositeManager compositeManager = fraSCAti.getCompositeManager();
compositeManager.getComposite("zibase.composite", frascatiClassLoader);
} catch (IOException e)
{
fail();
......@@ -97,6 +98,9 @@ public class LigthTest extends FraSCAtiTestCase
@AfterClass
public static void finish() throws FrascatiException
{
fraSCAti.close();
if(fraSCAti != null)
{
fraSCAti.close();
}
}
}
frascati/nuxeo/frascati-nuxeo-service-api/pom.xml
View file @ 86c88dd2
......@@ -19,6 +19,7 @@
<name>OW2 FraSCAti SCA Component API for Nuxeo</name>
<dependencies>
<!--
<dependency>
<groupId>org.ow2.frascati.model</groupId>
<artifactId>frascati-model</artifactId>
......@@ -37,6 +38,19 @@
<version>2.0.1.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime-bridge</artifactId>
<version>5.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime</artifactId>
<version>${nuxeo.version}</version>
<scope>provided</scope>
</dependency>
-->
</dependencies>
<build>
......
frascati/nuxeo/frascati-nuxeo-service-api/src/main/java/org/ow2/frascati/nuxeo/api/FraSCAtiNuxeoServiceItf.java
View file @ 86c88dd2
......@@ -27,10 +27,8 @@ package org.ow2.frascati.nuxeo.api;
import java.net.URL;
import org.osoa.sca.annotations.Service;
import org.ow2.frascati.nuxeo.FraSCAtiServiceException;
@Service
public interface FraSCAtiNuxeoServiceItf
{
......
frascati/nuxeo/frascati-nuxeo-service-api/src/main/java/org/ow2/frascati/nuxeo/api/FraSCAtiNuxeoServiceProviderItf.java
View file @ 86c88dd2
......@@ -33,6 +33,6 @@ public interface FraSCAtiNuxeoServiceProviderItf
/**
* Return a FraSCAtiNuxeoServiceItf implementation instance
*/
FraSCAtiNuxeoServiceItf getFraSCAtiService();
FraSCAtiNuxeoServiceItf getFraSCAtiNuxeoService();
}
frascati/nuxeo/frascati-nuxeo/logging.properties 0 → 100644
View file @ 86c88dd2
############################################################
# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
# For example java -Djava.util.logging.config.file=myfile
############################################################
############################################################
# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
# classes. These handlers will be installed during VM startup.
# Note that these classes must be on the system classpath.
# By default we only configure a ConsoleHandler, which will only
# show messages at the INFO and above levels.
handlers= java.util.logging.ConsoleHandler
# To also add the FileHandler, use the following line instead.
#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
# Default global logging level.
# This specifies which kinds of events are logged across
# all loggers. For any given facility this global level
# can be overridden by a facility specific level
# Note that the ConsoleHandler also has a separate level
# setting to limit messages printed to the console.
.level=INFO
############################################################
# Handler specific properties.
# Describes specific configuration info for Handlers.
############################################################
# default file output is in user's home directory.
java.util.logging.FileHandler.pattern = %h/java%u.log
java.util.logging.FileHandler.limit = 50000
java.util.logging.FileHandler.count = 1
java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
# Limit the message that are printed on the console to INFO and above.
java.util.logging.ConsoleHandler.level = FINE
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
############################################################
# Facility specific properties.
# Provides extra control for each logger.
############################################################
org.ow2.frascati.level = INFO
org.ow2.frascati.assembly.factory.level = INFO
# org.ow2.frascati.assembly.factory.manager.level = OFF
# org.ow2.frascati.assembly.factory.manager.AssemblyFactoryManager.level = OFF
org.ow2.frascati.assembly.factory.processor.level = INFO
# org.ow2.frascati.assembly.factory.processor.ScaBindingProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaBindingScaProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaComponentProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaComponentPropertyProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaComponentReferenceProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaComponentServiceProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaCompositeProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaCompositePropertyProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaCompositeReferenceProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaCompositeServiceProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaImplementationCompositeProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaImplementationJavaProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaImplementationProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaInterfaceJavaProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaInterfaceProcessor.level = OFF
# org.ow2.frascati.assembly.factory.processor.ScaPropertyTypeJavaProcessor.level = OFF
org.ow2.frascati.component.factory.level = INFO
org.ow2.frascati.component.factory.juliac.level = INFO
org.ow2.frascati.property.jaxb.level = INFO
org.ow2.frascati.binding.level = INFO
org.ow2.frascati.binding.factory.level = INFO
org.ow2.frascati.binding.jms.level = INFO
org.objectweb.fractal.bf.connectors.jms.level = INFO
org.ow2.frascati.implementation.level = INFO
org.ow2.frascati.implementation.bpel.level = INFO
org.ow2.frascati.implementation.bpel.easybpel.level = INFO
org.ow2.frascati.parser.level = INFO
org.ow2.frascati.tinfi.level = INFO
org.ow2.frascati.wsdl.level = INFO
com.ebmwebsourcing.level = INFO
com.sun.level = INFO
frascati/nuxeo/frascati-nuxeo/pom.xml
View file @ 86c88dd2
<?xml version="1.0"?>
<!--
* OW2 FraSCAti Nuxeo
* Copyright (c) 2012 Inria, University of Lille 1
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Contact: frascati@ow2.org
*
* Author: Christophe Munilla
*
* Contributor(s):
*
-->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
......@@ -35,49 +60,45 @@
<artifactId>nuxeo-runtime-bridge</artifactId>
<version>5.5-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>osgi-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- FOR NUXEO FEATURE -->
<dependency>
<groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime-test</artifactId>
<version>5.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.core</groupId>
<artifactId>nuxeo-core-test</artifactId>
<version>5.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.core</groupId>
<artifactId>nuxeo-core</artifactId>
<version>5.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.core</groupId>
<artifactId>nuxeo-core-api</artifactId>
<version>5.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.platform</groupId>
<artifactId>nuxeo-platform</artifactId>
<version>5.5</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-server-standalone</artifactId>
</exclusion>
<exclusion>
<groupId>org.milyn</groupId>
<artifactId>milyn-magger</artifactId>
</exclusion>
<exclusion>
<groupId>org.milyn</groupId>
<artifactId>flute</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.xml</groupId>
<artifactId>xsom</artifactId>
</exclusion>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>osgi-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.platform</groupId>
<artifactId>nuxeo-features-test</artifactId>
<version>5.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
<version>2.0</version>
<scope>provided</scope>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
</dependency>
<!-- TEST DEPENDENCIES-->
<dependency>
......@@ -343,12 +364,14 @@
<artifactItem><groupId>org.ow2.frascati.model</groupId><artifactId>frascati-model</artifactId><version>2.0.1.3</version></artifactItem>
<artifactItem><groupId>org.ow2.frascati.nuxeo</groupId><artifactId>frascati-nuxeo-service</artifactId><version>${project.version}</version></artifactItem>
<artifactItem><groupId>org.ow2.frascati.osgi</groupId><artifactId>frascati-starter</artifactId><version>${project.version}</version></artifactItem>
<artifactItem><groupId>org.ow2.frascati.osgi</groupId><artifactId>frascati-osgi-util</artifactId><version>${project.version}</version></artifactItem>
<artifactItem><groupId>org.ow2.frascati.osgi</groupId><artifactId>frascati-osgi-util</artifactId><version>${project.version}</version></artifactItem>
<artifactItem><groupId>org.ow2.frascati.nuxeo</groupId><artifactId>frascati-metamodel-nuxeo</artifactId><version>${project.version}</version></artifactItem>
<!--FOR TEST ARTIFACTS -->
<artifactItem><groupId>org.ow2.frascati</groupId><artifactId>frascati-binding-http</artifactId><version>${project.version}</version></artifactItem>
<artifactItem><groupId>org.ow2.frascati</groupId><artifactId>frascati-binding-ws</artifactId><version>${project.version}</version></artifactItem>
<artifactItem><groupId>org.ow2.frascati</groupId><artifactId>frascati-servlet-cxf</artifactId><version>${project.version}</version></artifactItem>
<artifactItem><groupId>org.objectweb.fractal.bf.connectors</groupId><artifactId>fractal-bf-connectors-soap-cxf</artifactId><version>0.10-SNAPSHOT</version></artifactItem>
</artifactItems>
</configuration>
</execution>
......@@ -359,7 +382,7 @@
<goal>copy</goal>
</goals>
<configuration>
<outputDirectory>${project.basedir}/src/test/resources</outputDirectory>
<outputDirectory>${project.basedir}/target/test-classes</outputDirectory>
<stripVersion>true</stripVersion>
<failBuild>true</failBuild>
<failOnMissingClassifierArtifact>true</failOnMissingClassifierArtifact>
......
frascati/nuxeo/frascati-nuxeo/src/main/java/org/ow2/frascati/nuxeo/FraSCAtiNuxeo.java
View file @ 86c88dd2
......@@ -71,7 +71,7 @@ implements Application, FraSCAtiNuxeoServiceProviderItf
"org.ow2.frascati.FraSCAti/frascati-nuxeo");
}
public FraSCAtiNuxeoServiceItf getFraSCAtiService()
public FraSCAtiNuxeoServiceItf getFraSCAtiNuxeoService()
{
return frascatiService;
}
......
frascati/nuxeo/frascati-nuxeo/src/main/resources/OSGI-INF/frascati-service.xml
View file @ 86c88dd2
<?xml version="1.0"?>
<!--
* OW2 FraSCAti Nuxeo
* Copyright (c) 2012 Inria, University of Lille 1
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Contact: frascati@ow2.org
*
* Author: Christophe Munilla
*
* Contributor(s):
*
-->
<component name="org.ow2.frascati.nuxeo">
<implementation class="org.nuxeo.runtime.bridge.ApplicationComponent" />
......
frascati/nuxeo/frascati-nuxeo/src/test/java/org/ow2/frascati/nuxeo/test/TestFraSCAtiInNuxeo.java
View file @ 86c88dd2
......@@ -37,7 +37,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.runtime.api.Framework;
import org.nuxeo.runtime.test.runner.Features;
import org.nuxeo.runtime.test.runner.FeaturesRunner;
......@@ -53,8 +52,7 @@ import org.ow2.frascati.nuxeo.api.FraSCAtiNuxeoServiceProviderItf;
@Features(FraSCAtiNuxeoFeature.class)
public class TestFraSCAtiInNuxeo
{
private final String resourcePath = "src/test/resources/";
private final String resourcePath = "target/test-classes/";
private final String pojoPath = resourcePath + "helloworld-pojo.jar";
private final String wsPath = resourcePath + "helloworld-ws-server.jar";
private final String servletPath = resourcePath + "frascati-helloworld-servlet.jar";
......@@ -69,13 +67,12 @@ public class TestFraSCAtiInNuxeo
String fcomponent;
@Before
public void setUp() throws MalformedURLException, ClientException,
Exception
public void setUp() throws Exception
{
try
{
frascatiService = (FraSCAtiNuxeoServiceItf) Framework.getLocalService(
FraSCAtiNuxeoServiceProviderItf.class).getFraSCAtiService();
FraSCAtiNuxeoServiceProviderItf.class).getFraSCAtiNuxeoService();
assertNotNull(frascatiService);
......
frascati/nuxeo/pom.xml
View file @ 86c88dd2
......@@ -277,9 +277,7 @@
<module>frascati-isolated</module>
<module>frascati-nuxeo-service-api</module>
<module>frascati-nuxeo-service</module>
<!--
<module>frascati-nuxeo</module>
-->
</modules>
</project>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment