diff --git a/Makefile b/Makefile index a0ba9ed..eb56d30 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/build.xml b/build.xml index 5429112..6d53e4c 100644 --- a/build.xml +++ b/build.xml @@ -27,20 +27,20 @@ Version is ${VERSION} - /* Automatically generated file */ -package gr.spinellis.umlgraph.doclet; + /* Automatically generated file */ +package org.umlgraph.doclet; class Version { public static String VERSION = "${VERSION}";} - + - + - + @@ -48,14 +48,14 @@ class Version { public static String VERSION = "${VERSION}";} - + - + @@ -81,8 +81,8 @@ class Version { public static String VERSION = "${VERSION}";} - - + + diff --git a/doc/ant.xml b/doc/ant.xml index f751acd..762e04c 100644 --- a/doc/ant.xml +++ b/doc/ant.xml @@ -13,7 +13,7 @@ like the following. - + diff --git a/doc/cd-oper.xml b/doc/cd-oper.xml index 5c9a053..0d830f7 100644 --- a/doc/cd-oper.xml +++ b/doc/cd-oper.xml @@ -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 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 and under Unix 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
  • Place the UmlGraph.jar @@ -85,13 +85,13 @@ and hyperlinks to the Sun Java API documentation for all other classes. Alternatively, you can also run UMLGraph from within javadoc. This can be useful if your IDE provides additional support for running javadoc. In this case you run -javadoc with arguments -doclet gr.spinellis.umlgraph.doclet.UmlGraph +javadoc with arguments -doclet org.umlgraph.doclet.UmlGraph -docletpath /path/to/UmlGraph.jar and append at the end the file(s) that contain your diagram specification. Example: -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

    Running Dot

    diff --git a/doc/cd-umldoc.xml b/doc/cd-umldoc.xml index 39ffccc..5a11264 100644 --- a/doc/cd-umldoc.xml +++ b/doc/cd-umldoc.xml @@ -23,9 +23,9 @@ UMLGraph javadocs are now generated with UmlGraphDoc with the following ant targ - - + diff --git a/doc/ceg-mv.xml b/doc/ceg-mv.xml index 4ab47e2..606bbda 100644 --- a/doc/ceg-mv.xml +++ b/doc/ceg-mv.xml @@ -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 diff --git a/doc/ceg-view-details.xml b/doc/ceg-view-details.xml index 79ee356..b2e249c 100644 --- a/doc/ceg-view-details.xml +++ b/doc/ceg-view-details.xml @@ -80,7 +80,7 @@ and by invoking the following commands (assuming UmlGraph.jar is in the current directory): -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 diff --git a/doc/ver.xml b/doc/ver.xml index ecd0441..0f9a6ab 100644 --- a/doc/ver.xml +++ b/doc/ver.xml @@ -3,7 +3,12 @@
    -
    Version 4.10 Under development
    +
    Version 5.0 Under development
    +
      +
    • All code now lives under org.umlgraph. +This change requires corresponding modifications to the UMLGraph +callers.
      • +
    Version 4.9 2007-09-28
    @@ -118,7 +123,7 @@ parameters -d, -view, -views (Andrea Aime)
    • conventions. The user-visible change is that the doclet is now invoked as -javadoc -docletpath UmlGraph.jar -doclet gr.spinellis.umlgraph.doclet.UmlGraph +javadoc -docletpath UmlGraph.jar -doclet org.umlgraph.doclet.UmlGraph
  • Show package visibility for class members (Olek Poplavskyy).
    • diff --git a/index.html b/index.html index 656c283..b95082a 100644 --- a/index.html +++ b/index.html @@ -19,7 +19,7 @@ The current features are part of an ongoing effort aiming to provide support for all types UML diagrams. An IEEE Software article titled -On the declarative specification of models +On the declarative specification of models 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).

    -Diomidis Spinellis home page +Diomidis Spinellis home page

    -Valid XHTML 1.0! -Level Triple-A conformance icon, W3C-WAI Web Content Accessibility Guidelines 1.0 +Valid XHTML 1.0! +Level Triple-A conformance icon, W3C-WAI Web Content Accessibility Guidelines 1.0 Creative Commons License Unless otherwise expressly stated, all original material on this page created by Diomidis Spinellis is licensed under a Creative Commons Attribution-Noncommercial-No Derivative Works 2.5 License.

    -Diomidis Spinellis home page +Diomidis Spinellis home page

    -Valid XHTML 1.0! -Level Triple-A conformance icon, W3C-WAI Web Content Accessibility Guidelines 1.0 +Valid XHTML 1.0! +Level Triple-A conformance icon, W3C-WAI Web Content Accessibility Guidelines 1.0 Creative Commons License Unless otherwise expressly stated, all original material on this page created by Diomidis Spinellis is licensed under a Creative Commons Attribution-Noncommercial-No Derivative Works 2.5 License.