Change references from gr.spinellis.umlgraph to org.umlgraph.

This commit is contained in:
Diomidis Spinellis 2007-11-27 09:04:22 +00:00
parent 20212d97f5
commit c60483af35
42 changed files with 77 additions and 72 deletions

View File

@ -2,13 +2,13 @@
# $Id$
#
VERSION?=4.9
VERSION?=5.0
TAGVERSION=$(shell echo $(VERSION) | sed 's/\./_/g')
BALL_TAR_GZ=UMLGraph-$(VERSION).tar.gz
ZIPBALL=UMLGraph-$(VERSION).zip
DISTDIR=UMLGraph-$(VERSION)
WEBDIR=$(UH)/dds/pubs/web/home/sw/umlgraph
DOCLETSRCPATH=src/gr/spinellis/umlgraph/doclet
DOCLETSRCPATH=src/org/umlgraph/doclet
DOCLETSRC= \
$(DOCLETSRCPATH)/ClassGraph.java \
$(DOCLETSRCPATH)/ClassInfo.java \
@ -17,8 +17,8 @@ DOCLETSRC= \
$(DOCLETSRCPATH)/UmlGraph.java \
$(DOCLETSRCPATH)/Version.java
TESTSRC = \
src/gr/spinellis/umlgraph/test/DotDiff.java \
src/gr/spinellis/umlgraph/test/BasicTest.java
src/org/umlgraph/test/DotDiff.java \
src/org/umlgraph/test/BasicTest.java
PICFILE=sequence.pic
README=README.txt
LICENSE=LICENSE
@ -41,7 +41,7 @@ all: $(JARFILE)
tarball: $(BALL_TAR_GZ)
src/gr/spinellis/umlgraph/doclet/Version.java: Makefile
src/org/umlgraph/doclet/Version.java: Makefile
ant -DVERSION="$(VERSION)" version
$(BALL_TAR_GZ): $(JARFILE) docs Makefile

View File

@ -27,20 +27,20 @@
<target name="version">
<echo>Version is ${VERSION}</echo>
<echo file="src/gr/spinellis/umlgraph/doclet/Version.java">/* Automatically generated file */
package gr.spinellis.umlgraph.doclet;
<echo file="src/org/umlgraph/doclet/Version.java">/* Automatically generated file */
package org.umlgraph.doclet;
class Version { public static String VERSION = "${VERSION}";}
</echo>
</target>
<target name="compile" depends="init"
description="compile the source, build library " >
<javac srcdir="${src}" destdir="${build}" debug="true" deprecation="true" excludes="gr/spinellis/umlgraph/doclet/RCS/*,gr/spinellis/umlgraph/test/RCS/*">
<javac srcdir="${src}" destdir="${build}" debug="true" deprecation="true" >
<compilerarg value="-Xlint"/>
</javac>
<jar basedir="${build}" destfile="${lib}/UmlGraph.jar" includes="gr/spinellis/umlgraph/doclet/*.class">
<jar basedir="${build}" destfile="${lib}/UmlGraph.jar" includes="org/umlgraph/doclet/*.class">
<manifest>
<attribute name="Main-Class" value="gr.spinellis.umlgraph.doclet.UmlGraph"/>
<attribute name="Main-Class" value="org.umlgraph.doclet.UmlGraph"/>
<attribute name="Class-Path" value="tools.jar"/>
</manifest>
</jar>
@ -48,14 +48,14 @@ class Version { public static String VERSION = "${VERSION}";}
<target name="test" depends="compile"
description="run the regression tests" >
<java classname="gr.spinellis.umlgraph.test.BasicTest" fork="true">
<java classname="org.umlgraph.test.BasicTest" fork="true">
<classpath>
<pathelement location="${env.JAVA_HOME}/lib/tools.jar"/>
<pathelement location="${build}"/>
<pathelement location="${lib}/UmlGraph.jar"/>
</classpath>
</java>
<java classname="gr.spinellis.umlgraph.test.UmlDocTest" fork="true">
<java classname="org.umlgraph.test.UmlDocTest" fork="true">
<classpath>
<pathelement location="${env.JAVA_HOME}/lib/tools.jar"/>
<pathelement location="${build}"/>
@ -81,8 +81,8 @@ class Version { public static String VERSION = "${VERSION}";}
</target>
<target name="javadocs" depends="compile">
<javadoc sourcepath="${src}" packagenames="gr.spinellis.umlgraph.doclet.*" destdir="${javadoc}" private="true">
<doclet name="gr.spinellis.umlgraph.doclet.UmlGraphDoc" path="${lib}/UmlGraph.jar">
<javadoc sourcepath="${src}" packagenames="org.umlgraph.doclet.*" destdir="${javadoc}" private="true">
<doclet name="org.umlgraph.doclet.UmlGraphDoc" path="${lib}/UmlGraph.jar">
<param name="-inferrel"/>
<param name="-inferdep"/>
<param name="-hide" value="java.*"/>

View File

@ -13,7 +13,7 @@ like the following.
<pathelement path="${src.java.dir}"/>
</path>
<javadoc sourcepathref="uml.source.path" packagenames="*" package="true">
<doclet name="gr.spinellis.umlgraph.doclet.UmlGraph" path="${basedir}/lib/UMLGraph.jar">
<doclet name="org.umlgraph.doclet.UmlGraph" path="${basedir}/lib/UMLGraph.jar">
<param name="-d" value="${uml.dir}"/>
</doclet>
</javadoc>

View File

@ -45,12 +45,12 @@ and specify the full name of the UmlGraph doclet as an argument to Java.
This is an invocation example under Windows
<fmtcode ext="bat">
java -classpath "lib/UmlGraph.jar;c:\program files\java\jdk1.6.0_02\lib\Tools.jar"
gr.spinellis.umlgraph.doclet.UmlGraph -package Test.java
org.umlgraph.doclet.UmlGraph -package Test.java
</fmtcode>
and under Unix
<fmtcode ext="sh">
java -classpath '/usr/share/lib/UmlGraph.jar:/opt/Java-1.6/lib/tools.jar' \
gr.spinellis.umlgraph.doclet.UmlGraph -package Test.java
org.umlgraph.doclet.UmlGraph -package Test.java
</fmtcode>
</li>
<li> Place the <code>UmlGraph.jar</code>
@ -85,13 +85,13 @@ and hyperlinks to the Sun Java API documentation for all other classes.
Alternatively, you can also run <em>UMLGraph</em> from within <em>javadoc</em>.
This can be useful if your IDE provides additional support for running <em>javadoc</em>.
In this case you run
<em>javadoc</em> with arguments <code>-doclet gr.spinellis.umlgraph.doclet.UmlGraph</code>
<em>javadoc</em> with arguments <code>-doclet org.umlgraph.doclet.UmlGraph</code>
<code>-docletpath /path/to/UmlGraph.jar</code>
and append at the end the file(s) that contain your diagram
specification.
Example:
<fmtcode ext="sh">
javadoc -docletpath UmlGraph.jar -doclet gr.spinellis.umlgraph.doclet.UmlGraph -private Simple.java
javadoc -docletpath UmlGraph.jar -doclet org.umlgraph.doclet.UmlGraph -private Simple.java
</fmtcode>
<h2>Running Dot</h2>

View File

@ -23,9 +23,9 @@ UMLGraph javadocs are now generated with UmlGraphDoc with the following ant targ
<fmtcode ext="xml">
<target name="javadocs" depends="compile">
<javadoc sourcepath="${src}" packagenames="gr.spinellis.umlgraph.doclet.*" destdir="${javadoc}"
<javadoc sourcepath="${src}" packagenames="org.umlgraph.doclet.*" destdir="${javadoc}"
private="true">
<doclet name="gr.spinellis.umlgraph.doclet.UmlGraphDoc" path="${lib}/UMLGraph.jar">
<doclet name="org.umlgraph.doclet.UmlGraphDoc" path="${lib}/UMLGraph.jar">
<param name="-inferrel"/>
<param name="-inferdep"/>
<param name="-hide" value="java.*"/>

View File

@ -83,7 +83,7 @@ dot_files += $(subst .dot,-small.dot,$(dot_files))
png_files := $(subst .dot,.png,$(dot_files))
jd:=javadoc
jd_flags := -docletpath $(uml_graph) -doclet gr.spinellis.umlgraph.doclet.UmlGraph -private
jd_flags := -docletpath $(uml_graph) -doclet org.umlgraph.doclet.UmlGraph -private
jd_flags += -nodefontsize 9 -edgefontsize 9
jd_flags += -nodefillcolor LemonChiffon

View File

@ -80,7 +80,7 @@ and by invoking the following commands (assuming UmlGraph.jar is in the
current directory):
<fmtcode ext="bat">
javadoc -doclet gr.spinellis.umlgraph.doclet.UmlGraph -private -docletpath UmlGraph.jar -views RootViews.java
javadoc -doclet org.umlgraph.doclet.UmlGraph -private -docletpath UmlGraph.jar -views RootViews.java
dot -Tpng -o root-small.png Overview.dot
dot -Tpng -o root.png DetailedView.dot
</fmtcode>

View File

@ -3,7 +3,12 @@
<notes>
<dl>
<dt>Version 4.10 Under development </dt><dd>
<dt>Version 5.0 Under development </dt><dd>
<ul>
<li> All code now lives under <code>org.umlgraph</code>.
This change requires corresponding modifications to the UMLGraph
callers.</li>
</ul>
</dd>
<dt>Version 4.9 2007-09-28 </dt><dd>
@ -118,7 +123,7 @@ parameters -d, -view, -views (Andrea Aime)</li>
conventions.
The user-visible change is that the doclet is now invoked as
<fmtcode ext="sh">
javadoc -docletpath UmlGraph.jar -doclet gr.spinellis.umlgraph.doclet.UmlGraph
javadoc -docletpath UmlGraph.jar -doclet org.umlgraph.doclet.UmlGraph
</fmtcode>
</li>
<li> Show package visibility for class members (Olek Poplavskyy). </li>

View File

@ -19,7 +19,7 @@ The current features
are part of an ongoing effort aiming to provide support for
all types UML diagrams.
An <em>IEEE Software</em> article titled
<a href="../../pubs/jrnl/2003-IEEESW-umlgraph/html/article.html">On the declarative specification of models</a>
<a href="http://www.spinellis.gr/pubs/jrnl/2003-IEEESW-umlgraph/html/article.html">On the declarative specification of models</a>
explains the rationale behind this approach.
The tehnology behind UMLGraph was used to draw many of the diagrams
appearing in the books
@ -157,11 +157,11 @@ please use this only for pulling UmlGraph into other projects).
<!-- End matter {{{1 -->
<p />
<a href="../../">Diomidis Spinellis home page</a>
<a href="http://www.spinellis.gr">Diomidis Spinellis home page</a>
<hr />
<font size="-2">
<a href="http://validator.w3.org/check/referer"><img hspace="4" align="left" src="../../valid-xhtml10.png" border="0" alt="Valid XHTML 1.0!" height="31" width="88" /></a>
<a href="http://www.w3.org/WAI/WCAG1AAA-Conformance" title="Explanation of Level Triple-A Conformance"><img hspace="4" align="left" border="0" height="32" width="88" src="../../wcag1AAA.gif" alt="Level Triple-A conformance icon, W3C-WAI Web Content Accessibility Guidelines 1.0" /></a>
<a href="http://validator.w3.org/check/referer"><img hspace="4" align="left" src="valid-xhtml10.png" border="0" alt="Valid XHTML 1.0!" height="31" width="88" /></a>
<a href="http://www.w3.org/WAI/WCAG1AAA-Conformance" title="Explanation of Level Triple-A Conformance"><img hspace="4" align="left" border="0" height="32" width="88" src="wcag1AAA.gif" alt="Level Triple-A conformance icon, W3C-WAI Web Content Accessibility Guidelines 1.0" /></a>
<!--Creative Commons License--><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/2.5/"><img hspace="4" align="left" alt="Creative Commons License" style="border-width: 0" src="http://creativecommons.org/images/public/somerights20.png"/></a>
Unless otherwise expressly stated, all original material on this page created by Diomidis Spinellis is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/2.5/">Creative Commons Attribution-Noncommercial-No Derivative Works 2.5 License</a>.
<!--/Creative Commons License--><!-- <rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.io.BufferedOutputStream;
import java.io.File;

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.util.HashMap;
import java.util.List;

View File

@ -16,7 +16,7 @@
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import com.sun.javadoc.ClassDoc;

View File

@ -16,7 +16,7 @@
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.io.IOException;
import java.io.PrintWriter;
@ -125,7 +125,7 @@ public class ContextMatcher implements ClassMatcher {
}
/**
* @see gr.spinellis.umlgraph.doclet.ClassMatcher#matches(com.sun.javadoc.ClassDoc)
* @see org.umlgraph.doclet.ClassMatcher#matches(com.sun.javadoc.ClassDoc)
*/
public boolean matches(ClassDoc cd) {
if (keepParentHide && opt.matchesHideExpression(cd.toString()))
@ -142,7 +142,7 @@ public class ContextMatcher implements ClassMatcher {
}
/**
* @see gr.spinellis.umlgraph.doclet.ClassMatcher#matches(java.lang.String)
* @see org.umlgraph.doclet.ClassMatcher#matches(java.lang.String)
*/
public boolean matches(String name) {
if (pattern.matcher(name).matches())

View File

@ -1,4 +1,4 @@
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.io.IOException;
import java.util.regex.Pattern;

View File

@ -1,4 +1,4 @@
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.util.regex.Pattern;

View File

@ -16,7 +16,7 @@
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import com.sun.javadoc.ClassDoc;

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.io.BufferedReader;
import java.io.File;

View File

@ -1,4 +1,4 @@
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.PackageDoc;

View File

@ -1,4 +1,4 @@
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.PackageDoc;

View File

@ -15,7 +15,7 @@
* $Id$
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

View File

@ -1,4 +1,4 @@
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
/**
* The possibile directions of a relation given a reference class (used in

View File

@ -1,4 +1,4 @@
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
/**
* A map from relation types to directions

View File

@ -1,4 +1,4 @@
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
/**
* The type of relation that links two entities

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.util.*;

View File

@ -1,4 +1,4 @@
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.util.regex.Pattern;

View File

@ -1,4 +1,4 @@
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
/**
* Options for UMLGraph class diagram generation

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.io.IOException;
import java.io.PrintWriter;
@ -44,7 +44,7 @@ import com.sun.javadoc.RootDoc;
public class UmlGraph {
private static final String programName = "UmlGraph";
private static final String docletName = "gr.spinellis.umlgraph.doclet.UmlGraph";
private static final String docletName = "org.umlgraph.doclet.UmlGraph";
/** Entry point through javadoc */
public static boolean start(RootDoc root) throws IOException {

View File

@ -1,4 +1,4 @@
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.io.BufferedReader;
import java.io.BufferedWriter;

View File

@ -15,7 +15,7 @@
* $Id$
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import java.util.ArrayList;
import java.util.LinkedHashMap;

View File

@ -17,7 +17,7 @@
* $Id$
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import com.sun.javadoc.ProgramElementDoc;

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import com.sun.javadoc.AnnotationDesc;
import com.sun.javadoc.AnnotationTypeDoc;

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.doclet;
package org.umlgraph.doclet;
import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.PackageDoc;

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.test;
package org.umlgraph.test;
import java.io.File;
import java.io.IOException;
@ -132,7 +132,7 @@ public class BasicTest {
private static void runDoclet(String[] options) {
com.sun.tools.javadoc.Main.execute("UMLGraph test", pw, pw, pw,
"gr.spinellis.umlgraph.doclet.UmlGraph", options);
"org.umlgraph.doclet.UmlGraph", options);
}
private static void compare(List<String> differences, File dotFile, File refFile)

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.test;
package org.umlgraph.test;
import java.io.BufferedReader;
import java.io.File;

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.test;
package org.umlgraph.test;
import java.io.File;
import java.io.PrintWriter;
@ -42,7 +42,7 @@ public class RunDoc {
private static void runDoclet(String[] options) {
com.sun.tools.javadoc.Main.execute("UMLGraph test", pw, pw, pw,
"gr.spinellis.umlgraph.doclet.UmlGraphDoc", options);
"org.umlgraph.doclet.UmlGraphDoc", options);
}
}

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.test;
package org.umlgraph.test;
import java.io.File;
import java.io.PrintWriter;
@ -54,7 +54,7 @@ public class RunOne {
}
private static void runDoclet(String[] options) {
com.sun.tools.javadoc.Main.execute("UMLGraph test", pw, pw, pw, "gr.spinellis.umlgraph.doclet.UmlGraph", options);
com.sun.tools.javadoc.Main.execute("UMLGraph test", pw, pw, pw, "org.umlgraph.doclet.UmlGraph", options);
}

View File

@ -17,7 +17,7 @@
* $Id$
*
*/
package gr.spinellis.umlgraph.test;
package org.umlgraph.test;
import java.io.File;
import java.io.FilenameFilter;

View File

@ -18,7 +18,7 @@
*
*/
package gr.spinellis.umlgraph.test;
package org.umlgraph.test;
import java.io.BufferedReader;
import java.io.File;

View File

@ -17,7 +17,7 @@
* $Id$
*
*/
package gr.spinellis.umlgraph.test;
package org.umlgraph.test;
import java.io.File;
import java.io.IOException;
@ -38,7 +38,7 @@ public class UmlDocTest {
static final String testDestFolder = "testdata/umldoc-out";
static final String testRefFolder = "testdata/umldoc-ref";
static final String doclet = "gr.spinellis.umlgraph.doclet.UmlGraphDoc";
static final String doclet = "org.umlgraph.doclet.UmlGraphDoc";
static PrintWriter pw = new PrintWriter(System.out);

View File

@ -20,6 +20,6 @@ else
FILETYPE=$2
shift 2
java -classpath "$UMLGRAPH_HOME/UmlGraph.jar:$JAVA_HOME/lib/Tools.jar" \
gr.spinellis.umlgraph.doclet.UmlGraph -package $* -output - $BASE.java |
org.umlgraph.doclet.UmlGraph -package $* -output - $BASE.java |
dot -T$FILETYPE -o$BASE.$FILETYPE
fi

View File

@ -16,6 +16,6 @@ goto end
:ok
java -classpath "%UMLGRAPH_HOME%\UmlGraph.jar;%JAVA_HOME%\lib\Tools.jar" gr.spinellis.umlgraph.doclet.UmlGraph -package %3 %4 %5 %6 %7 %8 %9 -output - %1.java | dot -T%2 -o%1.%2
java -classpath "%UMLGRAPH_HOME%\UmlGraph.jar;%JAVA_HOME%\lib\Tools.jar" org.umlgraph.doclet.UmlGraph -package %3 %4 %5 %6 %7 %8 %9 -output - %1.java | dot -T%2 -o%1.%2
:end

View File

@ -19,7 +19,7 @@ The current features
are part of an ongoing effort aiming to provide support for
all types UML diagrams.
An <em>IEEE Software</em> article titled
<a href="../../pubs/jrnl/2003-IEEESW-umlgraph/html/article.html">On the declarative specification of models</a>
<a href="http://www.spinellis.gr/pubs/jrnl/2003-IEEESW-umlgraph/html/article.html">On the declarative specification of models</a>
explains the rationale behind this approach.
The tehnology behind UMLGraph was used to draw many of the diagrams
appearing in the books
@ -157,11 +157,11 @@ please use this only for pulling UmlGraph into other projects).
<!-- End matter {{{1 -->
<p />
<a href="../../">Diomidis Spinellis home page</a>
<a href="http://www.spinellis.gr">Diomidis Spinellis home page</a>
<hr />
<font size="-2">
<a href="http://validator.w3.org/check/referer"><img hspace="4" align="left" src="../../valid-xhtml10.png" border="0" alt="Valid XHTML 1.0!" height="31" width="88" /></a>
<a href="http://www.w3.org/WAI/WCAG1AAA-Conformance" title="Explanation of Level Triple-A Conformance"><img hspace="4" align="left" border="0" height="32" width="88" src="../../wcag1AAA.gif" alt="Level Triple-A conformance icon, W3C-WAI Web Content Accessibility Guidelines 1.0" /></a>
<a href="http://validator.w3.org/check/referer"><img hspace="4" align="left" src="valid-xhtml10.png" border="0" alt="Valid XHTML 1.0!" height="31" width="88" /></a>
<a href="http://www.w3.org/WAI/WCAG1AAA-Conformance" title="Explanation of Level Triple-A Conformance"><img hspace="4" align="left" border="0" height="32" width="88" src="wcag1AAA.gif" alt="Level Triple-A conformance icon, W3C-WAI Web Content Accessibility Guidelines 1.0" /></a>
<!--Creative Commons License--><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/2.5/"><img hspace="4" align="left" alt="Creative Commons License" style="border-width: 0" src="http://creativecommons.org/images/public/somerights20.png"/></a>
Unless otherwise expressly stated, all original material on this page created by Diomidis Spinellis is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/2.5/">Creative Commons Attribution-Noncommercial-No Derivative Works 2.5 License</a>.
<!--/Creative Commons License--><!-- <rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">