Skip to content
GitLab
Commit 93a2658d authored by Hugo Roenick's avatar Hugo Roenick
Browse files

Commit final do item [SCS-370]: [JAVA] Fazer merge da configuracao do maven para 

utilizar JacORB 3.1 no trunk do SCS
 - svn merge -r136145:HEAD ^/scs/core/java/branches/SCS_CORE_JAVA_v1_02_01_2011_07_28 



git-svn-id: https://subversion.tecgraf.puc-rio.br/engdist/scs/core/java/trunk@137594 ae0415b3-e90b-0410-900d-d0be9363c56b
parent 4f2314a8
Hide whitespace changes
Inline Side-by-side
LICENSE
View file @ 93a2658d
......@@ -9,7 +9,7 @@ cost without having to ask us. The only requirement is that if you do use SCS,
then you should give us credit by including the appropriate copyright notice
somewhere in your product or its documentation.
Copyright (c) 2006-2011 Tecgraf/PUC-Rio. All rights reserved.
Copyright (c) 2006-2013 Tecgraf/PUC-Rio. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
......
demos/helloworld/README.txt
View file @ 93a2658d
......@@ -20,7 +20,8 @@ In order to execute without the Maven integration, you must:
2) copy all dependencies into it:
mvn dependency:copy-dependencies -DincludeScope=runtime \
-DoutputDirectory=/tmp/install
cp target/scs-demos-helloworld-1.3.0-SNAPSHOT.jar /tmp/install
cp target/scs-demos-helloworld-1.3-SNAPSHOT
.jar /tmp/install
3) now the RUNNING step could be successfully executed (see bin/rundemo to
understand how to change the SCS installation directory)
......
demos/helloworld/pom.xml
View file @ 93a2658d
......@@ -5,16 +5,16 @@
<groupId>tecgraf.scs</groupId>
<artifactId>scs-demos-helloworld</artifactId>
<packaging>jar</packaging>
<version>1.3.0-SNAPSHOT</version>
<version>1.3-SNAPSHOT</version>
<name>SCS Demo Helloworld</name>
<url>https://subversion.tecgraf.puc-rio.br/engdist/scs/core/java/trunk/demos/helloworld</url>
<properties>
<java.version>1.5</java.version>
<scs.version>1.3.0-SNAPSHOT</scs.version>
<scsidl.version>1.3-SNAPSHOT</scsidl.version>
<jacorb.version>2.3.0</jacorb.version>
<java.version>1.6</java.version>
<scs.version>1.3-SNAPSHOT
</scs.version>
<jacorb.version>3.1</jacorb.version>
<source.encoding>ISO-8859-1</source.encoding>
</properties>
......@@ -33,13 +33,6 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<encoding>${source.encoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>idlj-maven-plugin</artifactId>
......@@ -66,20 +59,23 @@
<compiler>jacorb</compiler>
<sourceDirectory>idl</sourceDirectory>
<includeDirs>
<includeDir>${env.IDL_PATH}</includeDir>
<includeDir>${scs.idlpath}</includeDir>
</includeDirs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<configuration>
<encoding>${source.encoding}</encoding>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>tecgraf.scs</groupId>
<artifactId>scs-idl-jacorb</artifactId>
<version>${scsidl.version}</version>
</dependency>
<dependency>
<groupId>tecgraf.scs</groupId>
<artifactId>scs-core</artifactId>
......
demos/stockmarket/README.txt
View file @ 93a2658d
......@@ -20,7 +20,8 @@ In order to execute without the Maven integration, you must:
2) copy all dependencies into it:
mvn dependency:copy-dependencies -DincludeScope=runtime \
-DoutputDirectory=/tmp/install
cp target/scs-demos-stockmarket-1.3.0-SNAPSHOT.jar /tmp/install
cp target/scs-demos-stockmarket-1.3-SNAPSHOT
.jar /tmp/install
3) now the RUNNING step could be successfully executed (see bin/rundemo to
understand how to change the SCS installation directory)
......
demos/stockmarket/pom.xml
View file @ 93a2658d
......@@ -5,16 +5,17 @@
<groupId>tecgraf.scs</groupId>
<artifactId>scs-demos-stockmarket</artifactId>
<packaging>jar</packaging>
<version>1.3.0-SNAPSHOT</version>
<version>1.3-SNAPSHOT
</version>
<name>SCS Demo StockMarket</name>
<url>https://subversion.tecgraf.puc-rio.br/engdist/scs/core/java/trunk/demos/stockmarket</url>
<properties>
<java.version>1.5</java.version>
<scs.version>1.3.0-SNAPSHOT</scs.version>
<scsidl.version>1.3-SNAPSHOT</scsidl.version>
<jacorb.version>2.3.0</jacorb.version>
<java.version>1.6</java.version>
<scs.version>1.3-SNAPSHOT
</scs.version>
<jacorb.version>3.1</jacorb.version>
<source.encoding>ISO-8859-1</source.encoding>
</properties>
......@@ -41,6 +42,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<configuration>
<encoding>${source.encoding}</encoding>
</configuration>
......@@ -71,7 +73,7 @@
<compiler>jacorb</compiler>
<sourceDirectory>idl</sourceDirectory>
<includeDirs>
<includeDir>${env.IDL_PATH}</includeDir>
<includeDir>${scs.idlpath}</includeDir>
</includeDirs>
</configuration>
</plugin>
......@@ -79,12 +81,6 @@
</build>
<dependencies>
<dependency>
<groupId>tecgraf.scs</groupId>
<artifactId>scs-idl-jacorb</artifactId>
<version>${scsidl.version}</version>
</dependency>
<dependency>
<groupId>tecgraf.scs</groupId>
<artifactId>scs-core</artifactId>
......
docs/tutorial/scsJavaTutorial.tex
View file @ 93a2658d
......@@ -47,7 +47,7 @@ desenvolvidos para o aux
execução. Essas informações também podem ser obtidas em outros documentos.
A implementação Java baseia-se na versão 1.5 da máquina virtual Java e em CORBA
v2.3, representada pelo ORB Jacorb v2.3.0 que está incluso na implementação
v2.3, representada pelo ORB Jacorb v3.1 que está incluso na implementação
padrão. Este documento assume que o leitor é familiarizado a conceitos de
desenvolvimento de \emph{software} baseado em componentes e à terminologia
CORBA.
......
pom.xml
View file @ 93a2658d
......@@ -5,16 +5,15 @@
<groupId>tecgraf.scs</groupId>
<artifactId>scs-core</artifactId>
<packaging>jar</packaging>
<version>1.3.0-SNAPSHOT</version>
<version>1.3-SNAPSHOT</version>
<name>SCS Core</name>
<url>https://subversion.tecgraf.puc-rio.br/engdist/scs/core/java/trunk</url>
<properties>
<idl.version>1.3-SNAPSHOT</idl.version>
<java.version>1.5</java.version>
<java.version>1.6</java.version>
<junit.version>4.6</junit.version>
<jacorb.version>2.3.0</jacorb.version>
<jacorb.version>3.1</jacorb.version>
<source.encoding>ISO-8859-1</source.encoding>
</properties>
......@@ -37,6 +36,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
......@@ -45,9 +45,37 @@
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>idlj-maven-plugin</artifactId>
<version>1.1</version>
<configuration>
<compiler>jacorb</compiler>
<sourceDirectory>${scs.idlpath}</sourceDirectory>
</configuration>
<dependencies>
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb-idl-compiler</artifactId>
<version>${jacorb.version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<configuration>
<encoding>${source.encoding}</encoding>
</configuration>
......@@ -56,12 +84,6 @@
</build>
<dependencies>
<dependency>
<groupId>tecgraf.scs</groupId>
<artifactId>scs-idl-jacorb</artifactId>
<version>${idl.version}</version>
</dependency>
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
......
scripts/jacorb-idl-compiler-pom.xml deleted 100644 → 0
View file @ 4f2314a8
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jacorb</groupId>
<artifactId>jacorb-idl-compiler</artifactId>
<version>2.3.0</version>
<packaging>jar</packaging>
<name>Jacorb IDL Compiler</name>
<url>http://www.jacorb.org</url>
<description>Jacorb IDL Compiler</description>
<scm>
<url>http://www.jacorb.org/cgi-bin/cvsweb/</url>
</scm>
<dependencies>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
<version>4.1.5</version>
</dependency>
<dependency>
<groupId>logkit</groupId>
<artifactId>logkit</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
</project>
scripts/jacorb-maven-installer.bat deleted 100644 → 0
View file @ 4f2314a8
set VERSION=2.3.0
mvn install:install-file -DgroupId=org.jacorb -DartifactId=jacorb ^
-Dversion=%VERSION% ^
-Dpackaging=jar ^
-Dfile=libs\jacorb-%VERSION%.jar ^
-DpomFile=scripts\jacorb-pom.xml
mvn install:install-file -DgroupId=org.jacorb ^
-DartifactId=jacorb-idl-compiler ^
-Dversion=%VERSION% ^
-Dpackaging=jar ^
-Dfile=libs\jacorb-idl-%VERSION%.jar ^
-DpomFile=scripts\jacorb-idl-compiler-pom.xml
scripts/jacorb-maven-installer.sh deleted 100755 → 0
View file @ 4f2314a8
#!/bin/sh
VERSION=2.3.0
mvn install:install-file -DgroupId=org.jacorb \
-DartifactId=jacorb \
-Dversion=$VERSION \
-Dpackaging=jar \
-Dfile=libs/jacorb-$VERSION.jar \
-DpomFile=scripts/jacorb-pom.xml
mvn install:install-file -DgroupId=org.jacorb \
-DartifactId=jacorb-idl-compiler \
-Dversion=$VERSION \
-Dpackaging=jar \
-Dfile=libs/jacorb-idl-$VERSION.jar \
-DpomFile=scripts/jacorb-idl-compiler-pom.xml
scripts/jacorb-pom.xml deleted 100644 → 0
View file @ 4f2314a8
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
<version>2.3.0</version>
<dependencies>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
<version>4.1.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>logkit</groupId>
<artifactId>logkit</artifactId>
<version>1.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
Supports Markdown
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