Commit 24e49013 authored by Amadeu Andrade Barbosa Junior's avatar Amadeu Andrade Barbosa Junior
Browse files

[OPENBUS-1495] Merge reintegrando as modificações realizadas nos branches para

o trunk dos módulos do SCS.

Em java atualizando a versão do SCS para 1.3.0-SNAPSHOT (padrao 4 numeros)
mantendo a SCS IDL como 1.3-SNAPSHOT (padrao 3 numeros) 


git-svn-id: https://subversion.tecgraf.puc-rio.br/engdist/scs/core/java/trunk@120996 ae0415b3-e90b-0410-900d-d0be9363c56b
parent bd8daf8a
......@@ -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-2010 Tecgraf/PUC-Rio. All rights reserved.
Copyright (c) 2006-2011 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
......
......@@ -20,7 +20,7 @@ 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-SNAPSHOT.jar /tmp/install
cp target/scs-demos-helloworld-1.3.0-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)
......
......@@ -16,8 +16,8 @@ $SCS_HOME/avalon-framework-4.1.5.jar:\
$SCS_HOME/jacorb-2.3.0.jar:\
$SCS_HOME/logkit-1.2.jar:\
$SCS_HOME/scs-idl-jacorb-1.3-SNAPSHOT.jar:\
$SCS_HOME/scs-core-1.3-SNAPSHOT.jar:\
$SCS_HOME/scs-demos-helloworld-1.3-SNAPSHOT.jar"
$SCS_HOME/scs-core-1.3.0-SNAPSHOT.jar:\
$SCS_HOME/scs-demos-helloworld-1.3.0-SNAPSHOT.jar"
echo $CLASSPATH
......
......@@ -9,6 +9,6 @@ IF NOT DEFINED SCS_HOME SET SCS_HOME=%DEFAULT_SCS_HOME%
ECHO [ INFO ]
ECHO Using the following PATH: %PATH%
ECHO [ Launching the demo: %1 ... ]
SET CLASSPATH="%SCS_HOME%\avalon-framework-4.1.5.jar;%SCS_HOME%\jacorb-2.3.0.jar;%SCS_HOME%\logkit-1.2.jar;%SCS_HOME%\scs-idl-jacorb-1.3-SNAPSHOT.jar;%SCS_HOME%\scs-core-1.3-SNAPSHOT.jar;%SCS_HOME%\scs-demos-helloworld-1.3-SNAPSHOT.jar"
SET CLASSPATH="%SCS_HOME%\avalon-framework-4.1.5.jar;%SCS_HOME%\jacorb-2.3.0.jar;%SCS_HOME%\logkit-1.2.jar;%SCS_HOME%\scs-idl-jacorb-1.3-SNAPSHOT.jar;%SCS_HOME%\scs-core-1.3.0-SNAPSHOT.jar;%SCS_HOME%\scs-demos-helloworld-1.3.0-SNAPSHOT.jar"
java -Djava.library.path=%SCS_HOME% -Djava.endorsed.dirs=%SCS_HOME% -Djacorb.home=%SCS_HOME% -Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton %*
ENDLOCAL
......@@ -5,14 +5,15 @@
<groupId>tecgraf.scs</groupId>
<artifactId>scs-demos-helloworld</artifactId>
<packaging>jar</packaging>
<version>1.3-SNAPSHOT</version>
<version>1.3.0-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-SNAPSHOT</scs.version>
<scs.version>1.3.0-SNAPSHOT</scs.version>
<scsidl.version>1.3-SNAPSHOT</scsidl.version>
<jacorb.version>2.3.0</jacorb.version>
<source.encoding>ISO-8859-1</source.encoding>
</properties>
......@@ -76,7 +77,7 @@
<dependency>
<groupId>tecgraf.scs</groupId>
<artifactId>scs-idl-jacorb</artifactId>
<version>${scs.version}</version>
<version>${scsidl.version}</version>
</dependency>
<dependency>
......
......@@ -20,7 +20,7 @@ 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-SNAPSHOT.jar /tmp/install
cp target/scs-demos-stockmarket-1.3.0-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)
......
......@@ -16,8 +16,8 @@ $SCS_HOME/avalon-framework-4.1.5.jar:\
$SCS_HOME/jacorb-2.3.0.jar:\
$SCS_HOME/logkit-1.2.jar:\
$SCS_HOME/scs-idl-jacorb-1.3-SNAPSHOT.jar:\
$SCS_HOME/scs-core-1.3-SNAPSHOT.jar:\
$SCS_HOME/scs-demos-stockmarket-1.3-SNAPSHOT.jar"
$SCS_HOME/scs-core-1.3.0-SNAPSHOT.jar:\
$SCS_HOME/scs-demos-stockmarket-1.3.0-SNAPSHOT.jar"
echo $CLASSPATH
......
......@@ -9,6 +9,6 @@ IF NOT DEFINED SCS_HOME SET SCS_HOME=%DEFAULT_SCS_HOME%
ECHO [ INFO ]
ECHO Using the following PATH: %PATH%
ECHO [ Launching the demo: %1 ... ]
SET CLASSPATH="%SCS_HOME%\avalon-framework-4.1.5.jar;%SCS_HOME%\jacorb-2.3.0.jar;%SCS_HOME%\logkit-1.2.jar;%SCS_HOME%\scs-idl-jacorb-1.3-SNAPSHOT.jar;%SCS_HOME%\scs-core-1.3-SNAPSHOT.jar;%SCS_HOME%\scs-demos-stockmarket-1.3-SNAPSHOT.jar"
SET CLASSPATH="%SCS_HOME%\avalon-framework-4.1.5.jar;%SCS_HOME%\jacorb-2.3.0.jar;%SCS_HOME%\logkit-1.2.jar;%SCS_HOME%\scs-idl-jacorb-1.3-SNAPSHOT.jar;%SCS_HOME%\scs-core-1.3.0-SNAPSHOT.jar;%SCS_HOME%\scs-demos-stockmarket-1.3.0-SNAPSHOT.jar"
java -Djava.library.path=%SCS_HOME% -Djava.endorsed.dirs=%SCS_HOME% -Djacorb.home=%SCS_HOME% -Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton %*
ENDLOCAL
......@@ -5,14 +5,15 @@
<groupId>tecgraf.scs</groupId>
<artifactId>scs-demos-stockmarket</artifactId>
<packaging>jar</packaging>
<version>1.3-SNAPSHOT</version>
<version>1.3.0-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-SNAPSHOT</scs.version>
<scs.version>1.3.0-SNAPSHOT</scs.version>
<scsidl.version>1.3-SNAPSHOT</scsidl.version>
<jacorb.version>2.3.0</jacorb.version>
<source.encoding>ISO-8859-1</source.encoding>
</properties>
......@@ -81,7 +82,7 @@
<dependency>
<groupId>tecgraf.scs</groupId>
<artifactId>scs-idl-jacorb</artifactId>
<version>${scs.version}</version>
<version>${scsidl.version}</version>
</dependency>
<dependency>
......
......@@ -40,7 +40,7 @@
\section{Introdução}
Este documento é um tutorial básico sobre a criação de componentes no modelo
SCS v1.3.0, utilizando a versão Java da implementação padrão. Não serão
SCS v1.3, utilizando a versão Java da implementação padrão. Não serão
encontradas aqui explicações sobre o modelo, as quais encontram-se em
documentos específicos. Também não será abordado o uso de serviços específicos
desenvolvidos para o auxílio ao uso do modelo, como a infra-estrutura de
......
......@@ -5,12 +5,13 @@
<groupId>tecgraf.scs</groupId>
<artifactId>scs-core</artifactId>
<packaging>jar</packaging>
<version>1.3-SNAPSHOT</version>
<version>1.3.0-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>
<junit.version>4.6</junit.version>
<jacorb.version>2.3.0</jacorb.version>
......@@ -58,7 +59,7 @@
<dependency>
<groupId>tecgraf.scs</groupId>
<artifactId>scs-idl-jacorb</artifactId>
<version>${project.version}</version>
<version>${idl.version}</version>
</dependency>
<dependency>
......
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