Skip to content

Commit

Permalink
moved packages with jaxb generted code to rhizoTrak/xsd;
Browse files Browse the repository at this point in the history
added RhizoTrakProjectConfig.xsd;
removed jaxb generated source from repo and added these to .gitignore
  • Loading branch information
Stefan-Posch committed Mar 14, 2018
1 parent 1ed42e3 commit b485719
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 881 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ target/
.project
.settings
.classpath
src/main/java/de/unihalle/informatik/rhizoTrak/xsd/*
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
<url>https://raw.githubusercontent.com/RootSystemML/RSMLValidator/master/rsml.xsd</url>
</schema>
</schemas>
<generatePackage>de.unihalle.informatik.rhizoTrak.rsml</generatePackage>
<generatePackage>de.unihalle.informatik.rhizoTrak.xsd.rsml</generatePackage>
<writeCode>true</writeCode>
<noFileHeader>false</noFileHeader>
<removeOldOutput>true</removeOldOutput>
Expand Down Expand Up @@ -286,9 +286,10 @@
<sources>
<source>src/main/resources/schemas/config.xsd</source>
<source>src/main/resources/schemas/settings.xsd</source>
<source>src/main/resources/schemas/RhizoTrakProjectConfig.xsd</source>
</sources>
<clearOutputDir>false</clearOutputDir>
<packageName>de.unihalle.informatik.rhizoTrak.config</packageName>
<packageName>de.unihalle.informatik.rhizoTrak.xsd.config</packageName>
</configuration>
</plugin>

Expand Down
11 changes: 7 additions & 4 deletions src/main/java/META-INF/sun-jaxb.episode
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,21 @@
Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 generiert
Siehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren.
Generiert: 2018.03.14 um 08:10:58 PM CET
Generiert: 2018.03.15 um 12:09:09 AM CET
-->
<jaxb:bindings scd="x-schema::">
<jaxb:schemaBindings map="false">
<jaxb:package name="de.unihalle.informatik.rhizoTrak.config"/>
<jaxb:package name="de.unihalle.informatik.rhizoTrak.xsd.config"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="RhizoTrakProjectConfig">
<jaxb:class ref="de.unihalle.informatik.rhizoTrak.xsd.config.RhizoTrakProjectConfig"/>
</jaxb:bindings>
<jaxb:bindings scd="config">
<jaxb:class ref="de.unihalle.informatik.rhizoTrak.config.Config"/>
<jaxb:class ref="de.unihalle.informatik.rhizoTrak.xsd.config.Config"/>
</jaxb:bindings>
<jaxb:bindings scd="globalSettings">
<jaxb:class ref="de.unihalle.informatik.rhizoTrak.config.GlobalSettings"/>
<jaxb:class ref="de.unihalle.informatik.rhizoTrak.xsd.config.GlobalSettings"/>
</jaxb:bindings>
</jaxb:bindings>
</jaxb:bindings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import javax.xml.bind.Unmarshaller;

import de.unihalle.informatik.rhizoTrak.Project;
import de.unihalle.informatik.rhizoTrak.config.Config;
import de.unihalle.informatik.rhizoTrak.config.GlobalSettings;
import de.unihalle.informatik.rhizoTrak.config.Config.StatusList;
import de.unihalle.informatik.rhizoTrak.config.Config.StatusList.Status;
import de.unihalle.informatik.rhizoTrak.config.GlobalSettings.GlobalStatusList;
import de.unihalle.informatik.rhizoTrak.config.GlobalSettings.GlobalStatusList.GlobalStatus;
import de.unihalle.informatik.rhizoTrak.xsd.config.Config;
import de.unihalle.informatik.rhizoTrak.xsd.config.GlobalSettings;
import de.unihalle.informatik.rhizoTrak.xsd.config.Config.StatusList;
import de.unihalle.informatik.rhizoTrak.xsd.config.Config.StatusList.Status;
import de.unihalle.informatik.rhizoTrak.xsd.config.GlobalSettings.GlobalStatusList;
import de.unihalle.informatik.rhizoTrak.xsd.config.GlobalSettings.GlobalStatusList.GlobalStatus;
import de.unihalle.informatik.rhizoTrak.display.Connector;
import de.unihalle.informatik.rhizoTrak.display.Displayable;
import de.unihalle.informatik.rhizoTrak.display.LayerSet;
Expand Down
Loading

0 comments on commit b485719

Please sign in to comment.