Revision: 189
http://mindtreeinsight.svn.sourceforge.net/mindtreeinsight/?rev=189&view=rev
Author: bindul
Date: 2009-03-08 18:30:08 +0000 (Sun, 08 Mar 2009)
Log Message:
-----------
Merged Insight 1.5.2 changes to trunk
Modified Paths:
--------------
insight/insight-ui/trunk/README.txt
insight/insight-ui/trunk/pom.xml
insight/insight-ui/trunk/src/assembly/bin.xml
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/gui/action/StopReceiverAction.java
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/preferences/xmlpersistence/PreferenceXMLNameConstants.java
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/preferences/xmlpersistence/XMLPreferenceDataReader.java
insight/insight-ui/trunk/src/main/scripts/insight.sh
insight/insight-ui/trunk/src/site/apt/index.apt
insight/insight-ui/trunk/src/site/site.xml
Property Changed:
----------------
insight/insight-ui/trunk/
Property changes on: insight/insight-ui/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /insight/insight-ui/branches/insight-ui-1.5.0:148-165
/insight/insight-ui/tags/insight-ui-1.5.0:146-147
/insight/insight-ui/tags/insight-ui-1.5.2:166-188
Modified: insight/insight-ui/trunk/README.txt
===================================================================
--- insight/insight-ui/trunk/README.txt 2009-03-08 15:57:24 UTC (rev 188)
+++ insight/insight-ui/trunk/README.txt 2009-03-08 18:30:08 UTC (rev 189)
@@ -1,7 +1,7 @@
********************************************************************************
*
* Release notes for the Insight.
-* Contents apply to the stable release candidate version 1.1.0
+* Contents apply to the stable release candidate version 1.5.2
*
* Copyright (c) 2005-2007 MindTree Consulting Ltd.
*
@@ -24,6 +24,28 @@
********************************************************************************
--------------------------------------------------------------------------------
+RELEASE NOTES FOR RELEASE 1.5.2
+--------------------------------------------------------------------------------
+Minor bugfix release off 1.5.1.
+
+As of version 1.5.0, all bug and feature request details point to the
SourceForge
+issue tracker system. Bugs can be accessed using the URL:
+https://sourceforge.net/tracker/index.php?func=detail&group_id=212019&atid=1020092&aid={BUG_ID}
+and Feature Requests can be accessed using the URL:
+https://sourceforge.net/tracker/index.php?func=detail&group_id=212019&atid=1020095&aid={FRQ_ID}
+
+Changes since the last release:
+- - - - - - - - - - - - - - - -
+1) Fixed ViewVC URL for insight-ui to add a missing path element
+
+Bug Fixes:
+1932949: Saving Insight Preferences
+1931487: Remote Receiver does not stop
+
+Feature Requests Implemented:
+1931541: Complete Insight bash script and test it
+
+--------------------------------------------------------------------------------
RELEASE NOTES FOR RELEASE 1.5.0
--------------------------------------------------------------------------------
First Release from SourceForge
Modified: insight/insight-ui/trunk/pom.xml
===================================================================
--- insight/insight-ui/trunk/pom.xml 2009-03-08 15:57:24 UTC (rev 188)
+++ insight/insight-ui/trunk/pom.xml 2009-03-08 18:30:08 UTC (rev 189)
@@ -56,6 +56,9 @@
<archive>
http://sourceforge.net/mailarchive/forum.php?forum_name=mindtreeinsight-devel
</archive>
+ <otherArchives>
+
<otherArchive>http://www.mail-archive.com/mindtreeinsight-de...@lists.sourceforge.net/</otherArchive>
+ </otherArchives>
</mailingList>
<mailingList>
<name>User Mailing List</name>
@@ -69,6 +72,9 @@
<archive>
http://sourceforge.net/mailarchive/forum.php?forum_name=mindtreeinsight-users
</archive>
+ <otherArchives>
+
<otherArchive>http://www.mail-archive.com/mindtreeinsight-us...@lists.sourceforge.net/</otherArchive>
+ </otherArchives>
</mailingList>
<mailingList>
<name>Subversion Commits Mailing List</name>
@@ -81,6 +87,9 @@
<archive>
http://sourceforge.net/mailarchive/forum.php?forum_name=mindtreeinsight-commits
</archive>
+ <otherArchives>
+
<otherArchive>http://www.mail-archive.com/mindtreeinsight-commits@lists.sourceforge.net/</otherArchive>
+ </otherArchives>
</mailingList>
</mailingLists>
<developers>
@@ -324,6 +333,25 @@
</testResources>
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <stylesheet>maven</stylesheet>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <linkJavadoc>true</linkJavadoc>
+
<javadocDir>target/site/apidocs</javadocDir>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
<dependencies>
<dependency>
<groupId>commons-net</groupId>
Modified: insight/insight-ui/trunk/src/assembly/bin.xml
===================================================================
--- insight/insight-ui/trunk/src/assembly/bin.xml 2009-03-08 15:57:24 UTC
(rev 188)
+++ insight/insight-ui/trunk/src/assembly/bin.xml 2009-03-08 18:30:08 UTC
(rev 189)
@@ -63,6 +63,14 @@
<include>**/*.png</include>
</includes>
</fileSet>
+ <!-- Sample files -->
+ <fileSet>
+ <directory>src/contrib/samples</directory>
+ <outputDirectory>samples</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
</fileSets>
<files>
<!-- The Windows binary scripts -->
Modified:
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/gui/action/StopReceiverAction.java
===================================================================
---
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/gui/action/StopReceiverAction.java
2009-03-08 15:57:24 UTC (rev 188)
+++
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/gui/action/StopReceiverAction.java
2009-03-08 18:30:08 UTC (rev 189)
@@ -1,8 +1,8 @@
/*
- * $HeadURL: $
- * $Date: $
- * $Revision: $
- * $Author: $
+ * $HeadURL$
+ * $Date$
+ * $Revision$
+ * $Author$
*
* Copyright (c) 2005 MindTree Consulting Ltd.
*
@@ -75,14 +75,20 @@
AbstractReceiver receiver = LoadLocalFileAction.getInstance ()
.getReceiver ();
- if (null == receiver) {
- receiver = RemoteProtocolListenerAction.getInstance ()
- .getReceiver ();
- }
if (null != receiver) {
receiver.shutdown ();
}
+
+ // Do the same for the remote protocol receiver
+ // SF.net defect id: 1931487, this is a work around as the
receivers
+ // from the LoadLocalFileAction is never removed, hence if a
local file
+ // is loaded first, and then the remote receiver started, in
the old
+ // way of doing things, the remote receiver can never be
stopped.
+ receiver = RemoteProtocolListenerAction.getInstance
().getReceiver ();
+ if (null != receiver) {
+ receiver.shutdown ();
+ }
}
/**
Modified:
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/preferences/xmlpersistence/PreferenceXMLNameConstants.java
===================================================================
---
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/preferences/xmlpersistence/PreferenceXMLNameConstants.java
2009-03-08 15:57:24 UTC (rev 188)
+++
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/preferences/xmlpersistence/PreferenceXMLNameConstants.java
2009-03-08 18:30:08 UTC (rev 189)
@@ -1,8 +1,8 @@
/*
- * $HeadURL: $
- * $Date: $
- * $Revision: $
- * $Author: $
+ * $HeadURL$
+ * $Date$
+ * $Revision$
+ * $Author$
*
* Copyright (c) 2005 MindTree Consulting Ltd.
*
@@ -37,7 +37,7 @@
/**
* Namespace of the XML file
*/
- static final String DEFAULT_NAMESPACE =
"http://mindtree.com/logging/insight/Preferences";;
+ static final String DEFAULT_NAMESPACE =
"http://mindtree.com/techworks/insight/Preferences";;
/**
* The XSI Namespace
Modified:
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/preferences/xmlpersistence/XMLPreferenceDataReader.java
===================================================================
---
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/preferences/xmlpersistence/XMLPreferenceDataReader.java
2009-03-08 15:57:24 UTC (rev 188)
+++
insight/insight-ui/trunk/src/main/java/com/mindtree/techworks/insight/preferences/xmlpersistence/XMLPreferenceDataReader.java
2009-03-08 18:30:08 UTC (rev 189)
@@ -1,8 +1,8 @@
/*
- * $HeadURL: $
- * $Date: $
- * $Revision: $
- * $Author: $
+ * $HeadURL$
+ * $Date$
+ * $Revision$
+ * $Author$
*
* Copyright (c) 2005 MindTree Consulting Ltd.
*
@@ -267,6 +267,11 @@
* The of the current PreferenceAttribute being read
*/
private ArrayList currentPreferenceAttributeOptionList;
+
+ /**
+ * The character buffer is used to hold the character data being parsed.
+ */
+ private StringBuffer characterBuffer;
/**
* Default constructor
@@ -275,6 +280,7 @@
cache = XMLPreferenceDataCache.getInstance();
preferenceStack = new Stack();
+ characterBuffer = new StringBuffer();
}
/**
@@ -284,6 +290,39 @@
public void endElement (String uri, String localName, String qName)
throws SAXException {
+ // Set the value of the element
+ if (null != currentElementToReadDataFor &&
characterBuffer.length() > 0) {
+ if (currentElementToReadDataFor
+
.equals(XMLNAME_PREF_ATT_DEFAULT_VALUE)) {
+ currentPreferenceAttributeDefaultValue =
currentPreferenceAttributeDefaultValue + characterBuffer.toString();
+ } else if (currentElementToReadDataFor
+ .equals(XMLNAME_PREF_ATT_VALUE)) {
+ currentPreferenceAttributeValue =
currentPreferenceAttributeValue + characterBuffer.toString();
+ } else if (currentElementToReadDataFor
+ .equals(XMLNAME_PREF_ATT_TYPE)) {
+ currentPreferenceAttributeType =
PreferenceAttributeType
+
.getPreferenceAttributeByName(characterBuffer.toString());
+ } else if (currentElementToReadDataFor
+ .equals(XMLNAME_PREF_ATT_ENCRYPTED)) {
+ isPreferenceAttributeValueEncrypted =
TRUE.equals(characterBuffer.toString());
+ if(isPreferenceAttributeValueEncrypted)
+ currentPreferenceAttributeValue =
+
Crypt.decryptHexString(currentPreferenceAttributeValue);
+ } else if (currentElementToReadDataFor
+ .equals(XMLNAME_PREF_ATT_PERSISTANT)) {
+ isCurrentPreferenceAttributePersistant =
TRUE.equals(characterBuffer.toString());
+ } else if (currentElementToReadDataFor
+ .equals(XMLNAME_PREF_ATT_USER_MOD)) {
+ isCurrentPreferenceAttributeUserModifiable =
TRUE.equals(characterBuffer.toString());
+ } else if (currentElementToReadDataFor
+ .equals(XMLNAME_PREF_ATT_OPTION_VAL)
+ && null !=
currentPreferenceAttributeOptionList) {
+
currentPreferenceAttributeOptionList.add(characterBuffer.toString());
+ }
+
+ characterBuffer.setLength(0);
+ }
+
if (XMLNAME_PREFERENCE.equals(localName)) {
endPreference();
} else if (XMLNAME_INSIGHT_PREFERENCE.equals(localName)) {
@@ -331,6 +370,9 @@
} else {
System.out.println("START-" + uri + "_" + localName +
"_" + qName);
}
+
+ // Clear the character buffer
+ characterBuffer.setLength(0);
}
/**
@@ -340,45 +382,10 @@
throws SAXException {
if (null != currentElementToReadDataFor) {
- StringBuffer value = new StringBuffer(length);
- for (int i = start; i < start + length; i++ ) {
- value.append(ch[i]);
- }
- String stringValue = value.toString();
-
- if (currentElementToReadDataFor
-
.equals(XMLNAME_PREF_ATT_DEFAULT_VALUE)) {
- currentPreferenceAttributeDefaultValue =
currentPreferenceAttributeDefaultValue + stringValue;
- } else if (currentElementToReadDataFor
- .equals(XMLNAME_PREF_ATT_VALUE)) {
- currentPreferenceAttributeValue =
currentPreferenceAttributeValue + stringValue;
- } else if (currentElementToReadDataFor
- .equals(XMLNAME_PREF_ATT_TYPE)) {
- currentPreferenceAttributeType =
PreferenceAttributeType
-
.getPreferenceAttributeByName(stringValue);
- } else if (currentElementToReadDataFor
- .equals(XMLNAME_PREF_ATT_ENCRYPTED)) {
- isPreferenceAttributeValueEncrypted =
TRUE.equals(stringValue);
- if(isPreferenceAttributeValueEncrypted)
- currentPreferenceAttributeValue =
-
Crypt.decryptHexString(currentPreferenceAttributeValue);
- }
- else if (currentElementToReadDataFor
- .equals(XMLNAME_PREF_ATT_PERSISTANT)) {
- isCurrentPreferenceAttributePersistant =
TRUE.equals(stringValue);
- } else if (currentElementToReadDataFor
- .equals(XMLNAME_PREF_ATT_USER_MOD)) {
- isCurrentPreferenceAttributeUserModifiable =
TRUE.equals(stringValue);
- } else if (currentElementToReadDataFor
- .equals(XMLNAME_PREF_ATT_OPTION_VAL)
- && null !=
currentPreferenceAttributeOptionList) {
-
currentPreferenceAttributeOptionList.add(stringValue);
- }
+ characterBuffer.append(ch, start, length);
}
- }
-
-
+ }
/**
* Creates a Preference Object
Modified: insight/insight-ui/trunk/src/main/scripts/insight.sh
===================================================================
--- insight/insight-ui/trunk/src/main/scripts/insight.sh 2009-03-08
15:57:24 UTC (rev 188)
+++ insight/insight-ui/trunk/src/main/scripts/insight.sh 2009-03-08
18:30:08 UTC (rev 189)
@@ -31,4 +31,63 @@
# Insight. If not, see <http://www.gnu.org/licenses/>.
#
-echo "Not yet implemented"
\ No newline at end of file
+# Messages
+JAVA_NOT_FOUND="A Java executable has not been found. Please ensure 'java' is
in the PATH or JAVA_HOME environment variable is defined"
+INSIGHT_HOME_NOT_FOUND="Insight home could not be inferred. Please define
INSIGHT_HOME variable"
+
+# Find out Java Home
+JAVA_EXECUTABLE=
+if [ $JAVA_HOME ]; then
+ if [ -x $JAVA_HOME/bin/java ]; then
+ JAVA_EXECUTABLE=$JAVA_HOME/bin/java;
+ fi
+else
+ which java
+ if [ $? == 0 ]; then
+ JAVA_EXECUTABLE=`which java`
+ fi
+fi
+
+if [ -z $JAVA_EXECUTABLE ]; then
+ echo $JAVA_NOT_FOUND;
+ exit 1
+fi
+
+# Find out Insight Home
+if [ -z $INSIGHT_HOME ]; then
+ # Insight Home is not defined, let us try to find it
+ # resolve links - $0 may be a softlink
+ PRG="$0"
+
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`/"$link"
+ fi
+ done
+
+ INSIGHT_HOME=`dirname "$PRG"`
+fi
+
+# Check if Insight Home is fine
+if [ ! -f $INSIGHT_HOME/config/insight-preferences.xml ]; then
+ echo $INSIGHT_HOME_NOT_FOUND;
+ exit 1
+fi
+
+# All is good... now let us define the classpaths
+INSIGHT_JAR=${project.artifactId}-${project.version}.jar
+INSIGHT_CLASS_PATH=.:$INSIGHT_HOME/$INSIGHT_JAR:$INSIGHT_HOME/bin
+
+for JAR_FILE in `ls $INSIGHT_HOME/lib`; do
+ INSIGHT_CLASS_PATH=$INSIGHT_CLASS_PATH:$INSIGHT_HOME/lib/$JAR_FILE
+done
+
+# Call Insight
+$JAVA_EXECUTABLE -classpath $INSIGHT_CLASS_PATH -DINSIGHT_HOME=$INSIGHT_HOME
com.mindtree.techworks.insight.Insight $@
+
+echo
+echo "Thank you for using Insight"
Modified: insight/insight-ui/trunk/src/site/apt/index.apt
===================================================================
--- insight/insight-ui/trunk/src/site/apt/index.apt 2009-03-08 15:57:24 UTC
(rev 188)
+++ insight/insight-ui/trunk/src/site/apt/index.apt 2009-03-08 18:30:08 UTC
(rev 189)
@@ -1,5 +1,5 @@
------
- Insight UI Help
+ Insight UI
------
Bindul Bhowmik
------
Modified: insight/insight-ui/trunk/src/site/site.xml
===================================================================
--- insight/insight-ui/trunk/src/site/site.xml 2009-03-08 15:57:24 UTC (rev
188)
+++ insight/insight-ui/trunk/src/site/site.xml 2009-03-08 18:30:08 UTC (rev
189)
@@ -28,7 +28,8 @@
<links>
<item name="MindTree" href="http://www.mindtree.com/"; />
<item name="Insight"
href="http://mindtreeinsight.sourceforge.net/"/>
- <item name="Insight Remote Protocol"
href="http://mindtreeinsight.sourceforge.net/remote-protocol-j/index.html"/>
+ <item name="Insight Remote Protocol"
href="http://mindtreeinsight.sourceforge.net/remote-protocol-j/"/>
+ <item name="Release Engineering"
href="http://mindtreeinsight.sourceforge.net/releng/"/>
</links>
<menu name="Insight UI">
<item name="Home" href="index.html"/>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
MindTreeInsight-commits mailing list
MindTreeInsight-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mindtreeinsight-commits
