You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ju...@apache.org on 2004/01/02 20:46:30 UTC
cvs commit: incubator-geronimo/modules/clustering build.sh
jules 2004/01/02 11:46:30
Modified: modules/clustering/src/java/org/apache/geronimo/clustering
LocalCluster.java Data.java
Added: modules/clustering build.sh
Log:
logging on state xfer
useful build script
Revision Changes Path
1.9 +4 -2 incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/LocalCluster.java
Index: LocalCluster.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/LocalCluster.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LocalCluster.java 2 Jan 2004 14:19:04 -0000 1.8
+++ LocalCluster.java 2 Jan 2004 19:46:30 -0000 1.9
@@ -143,7 +143,9 @@
_channel=LocalChannel.find(getName());
synchronized (_channel)
{
- setData(_channel.getData());
+ Data data=_channel.getData();
+ _log.info("state transfer - sending: "+data);
+ setData(data);
_channel.join(this);
}
1.3 +5 -1 incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/Data.java
Index: Data.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/clustering/src/java/org/apache/geronimo/clustering/Data.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Data.java 2 Jan 2004 14:19:04 -0000 1.2
+++ Data.java 2 Jan 2004 19:46:30 -0000 1.3
@@ -60,6 +60,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+// TODO - should this just inherit from HashMap ?
+
/**
* An object capable of holding the state of multiple applications and
* tiers. This will be a Map of tiers (web, ejb, ...). Each tier may
@@ -87,4 +89,6 @@
protected Map _tiers=new HashMap();
public Map getTiers(){return _tiers;};
+
+ public String toString(){return _tiers.toString();}
}
1.1 incubator-geronimo/modules/clustering/build.sh
Index: build.sh
===================================================================
#!/bin/sh
## to be run from the modules/clustering dir...
## I have Emacs menu options for switching JAVA_HOME, MAVEN_HOME,
## ANT_HOME so these need to be added to my PATH lazily...
PATH=$MAVEN_HOME/bin:$PATH
PATH=$JAVA_HOME/bin:$PATH
PATH=$ANT_HOME/bin:$PATH
export PATH
export JAVA_HOME
export MAVEN_HOME
export ANT_HOME
## rebuild clustering service
## install result into dev tree
## run dev tree
time maven --emacs clean build jar:install javadoc && \
cp target/*.jar ../../target/geronimo-DEV/lib/ && \
cp src/deploy/*.xml ../../target/geronimo-DEV/deploy/ && \
cd ../../ &&
time maven --emacs run:main
Re: cvs commit: incubator-geronimo/modules/clustering build.sh
Posted by Jules Gosnell <ju...@coredevelopers.net>.
Ok - no problem. I didn't know about the -Dmodules flag - I'll use that
and lose the script...
Jules
David Jencks wrote:
>
> On Friday, January 2, 2004, at 02:39 PM, Jacek Laskowski wrote:
>
>> jules@apache.org wrote:
>>
> <big snip>
>
>>> cp target/*.jar ../../target/geronimo-DEV/lib/ && \
>>> cp src/deploy/*.xml ../../target/geronimo-DEV/deploy/ && \
>>> cd ../../ &&
>>
>
> This copying should happen automatically when you run the base maven
> script via something like
> maven -Dmodules=clustering
> and not happen at all if you run the clustering maven build.
>
> Are you trying to make the module products get installed without
> running top level maven? If so, why?
>
> david jencks
>
>>
>> BTW, why is the module not in geronimo-DEV by default? Do you think
>> it would cause any trouble?
>>
>> Jacek
>>
>
--
/*************************************
* Jules Gosnell
* Partner
* Core Developers Network (Europe)
* http://www.coredevelopers.net
*************************************/
Re: cvs commit: incubator-geronimo/modules/clustering build.sh
Posted by David Jencks <da...@coredevelopers.net>.
On Friday, January 2, 2004, at 02:39 PM, Jacek Laskowski wrote:
> jules@apache.org wrote:
>
<big snip>
>> cp target/*.jar ../../target/geronimo-DEV/lib/ && \
>> cp src/deploy/*.xml ../../target/geronimo-DEV/deploy/ && \
>> cd ../../ &&
This copying should happen automatically when you run the base maven
script via something like
maven -Dmodules=clustering
and not happen at all if you run the clustering maven build.
Are you trying to make the module products get installed without
running top level maven? If so, why?
david jencks
>
> BTW, why is the module not in geronimo-DEV by default? Do you think it
> would cause any trouble?
>
> Jacek
>
Re: cvs commit: incubator-geronimo/modules/clustering build.sh
Posted by Jacek Laskowski <ja...@hp.com>.
jules@apache.org wrote:
> jules 2004/01/02 11:46:30
>
> Modified: modules/clustering/src/java/org/apache/geronimo/clustering
> LocalCluster.java Data.java
> Added: modules/clustering build.sh
> Log:
> logging on state xfer
> useful build script
[...]
> 1.1 incubator-geronimo/modules/clustering/build.sh
>
> Index: build.sh
> ===================================================================
> #!/bin/sh
>
> ## to be run from the modules/clustering dir...
>
> ## I have Emacs menu options for switching JAVA_HOME, MAVEN_HOME,
> ## ANT_HOME so these need to be added to my PATH lazily...
>
> PATH=$MAVEN_HOME/bin:$PATH
> PATH=$JAVA_HOME/bin:$PATH
> PATH=$ANT_HOME/bin:$PATH
>
> export PATH
> export JAVA_HOME
> export MAVEN_HOME
> export ANT_HOME
>
> ## rebuild clustering service
> ## install result into dev tree
> ## run dev tree
> time maven --emacs clean build jar:install javadoc && \
Why do you invoke jar:install separatelly? Almost if not all modules are
installed doing 'maven rebuild'. I don't know how it's done, but it is.
Nova's maven.xml has something as follows:
<goal name="default">
<attainGoal name="jar:install"/>
</goal>
<goal name="build">
<attainGoal name="default"/>
</goal>
<goal name="rebuild">
<attainGoal name="clean"/>
<attainGoal name="build"/>
</goal>
> cp target/*.jar ../../target/geronimo-DEV/lib/ && \
> cp src/deploy/*.xml ../../target/geronimo-DEV/deploy/ && \
> cd ../../ &&
BTW, why is the module not in geronimo-DEV by default? Do you think it
would cause any trouble?
Jacek