diff --git a/org.modeldriven.fuml/.classpath b/org.modeldriven.fuml/.classpath index 37e9fc52..be039e75 100644 --- a/org.modeldriven.fuml/.classpath +++ b/org.modeldriven.fuml/.classpath @@ -6,6 +6,7 @@ + @@ -13,15 +14,15 @@ + - - + @@ -30,12 +31,7 @@ - - - - - - + diff --git a/org.modeldriven.fuml/.settings/org.eclipse.jdt.core.prefs b/org.modeldriven.fuml/.settings/org.eclipse.jdt.core.prefs index 62a317c8..5208f746 100644 --- a/org.modeldriven.fuml/.settings/org.eclipse.jdt.core.prefs +++ b/org.modeldriven.fuml/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,16 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/org.modeldriven.fuml/.settings/org.eclipse.wst.common.component b/org.modeldriven.fuml/.settings/org.eclipse.wst.common.component index 333a78f2..cd194e33 100644 --- a/org.modeldriven.fuml/.settings/org.eclipse.wst.common.component +++ b/org.modeldriven.fuml/.settings/org.eclipse.wst.common.component @@ -1,8 +1,12 @@ - - - - - - - - + + + + + + + + + + + + diff --git a/org.modeldriven.fuml/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.modeldriven.fuml/.settings/org.eclipse.wst.common.project.facet.core.xml index 5c9bd753..f4bf050d 100644 --- a/org.modeldriven.fuml/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/org.modeldriven.fuml/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/org.modeldriven.fuml/CommandLine-Setup-Instructions.txt b/org.modeldriven.fuml/CommandLine-Setup-Instructions.txt index 78b6ba7f..9dea0d25 100644 --- a/org.modeldriven.fuml/CommandLine-Setup-Instructions.txt +++ b/org.modeldriven.fuml/CommandLine-Setup-Instructions.txt @@ -1,11 +1,11 @@ -1.) Download and install Java 1.6.x JDK and set your JAVA_HOME -environment variable to the JDK root diretory. +1.) Download and install Java JDK 8 or 11 and set your JAVA_HOME +environment variable to the JDK root directory. - See http://www.oracle.com/technetwork/java/javaee/downloads/java-ee-sdk-6u3-jdk-6u29-downloads-523388.html + See https://www.oracle.com/java/technologies/downloads + See https://adoptium.net/temurin/releases 2.) Download and install Maven 2.2.1 (not 3). Make sure the -Maven 'bin' directory is part of you system path. - +Maven 'bin' directory is part of your system path. See http://maven.apache.org/download.cgi diff --git a/org.modeldriven.fuml/Licensing-Information.txt b/org.modeldriven.fuml/Licensing-Information.txt index fba8b247..fd5877b4 100644 --- a/org.modeldriven.fuml/Licensing-Information.txt +++ b/org.modeldriven.fuml/Licensing-Information.txt @@ -35,12 +35,11 @@ Apache log4j, http://logging.apache.org/, AL v2.0 Apache commons logging, http://commons.apache.org/logging/, AL v2.0 Apache Xerces, http://xerces.apache.org/, AL v2.0 -The official baseline for the Software is maintained by ModelDriven.org, a -division of Data Access Technologies, Inc. The copyright owner of all -modifications to the Software in releases after the initial release is Data -Access Technologies, Inc. Such subsequent releases are also licensed to you -under the Academic Free License version 3.0, except for the software programs -listed above. +The official baseline for the Software is maintained by Model Driven Solutions, +Inc., the successor to Data Access Technologies, Inc., and the copyright owner +of all modifications to the Software in releases after the initial release. Such +subsequent releases are also licensed to you under the Academic Free License +version 3.0, except for the software programs listed above. Note to anyone further modifying or adding software to a release of the Reference Implementation: do not include any software that is licensed under diff --git a/org.modeldriven.fuml/README.md b/org.modeldriven.fuml/README.md index 2f4c7b92..96a6caf4 100644 --- a/org.modeldriven.fuml/README.md +++ b/org.modeldriven.fuml/README.md @@ -34,8 +34,8 @@ associated files [Common-Public-License-1.0.txt](https://github.com/ModelDriven/ The implementation build requires the following to be installed: -* Oracle Java Version 8 or above - see http://java.oracle.com/ -* Apache Maven Version 2.2 or above - see http://maven.apache.org/ +* Java Version 8 or 11 – see [http://java.oracle.com/downloads](http://java.oracle.com/downloads) or [https://adoptium.net/temurin/releases](http://java.oracle.com/downloads) +* Apache Maven Version 2.2 or above – see http://maven.apache.org/ To build from the command line: @@ -52,7 +52,7 @@ be displayed. Generated and compiled code can be found under the 'target' directory. To build using Eclipse: - The implementation build requires Eclipse Mars or above with the M2E plugin and dependencies: + The implementation build requires Eclipse 4.16 (2020-06) or above with the M2E plugin and dependencies: 1. Start Eclipse diff --git a/org.modeldriven.fuml/pom.xml b/org.modeldriven.fuml/pom.xml index f83fa134..2471b69d 100644 --- a/org.modeldriven.fuml/pom.xml +++ b/org.modeldriven.fuml/pom.xml @@ -5,7 +5,7 @@ fuml jar FUML Reference Implementation - 1.5.0 + 1.5.0a This open source software is a reference implementation, consisting of software and related files, for the OMG specification called the Semantics of a Foundational Subset for Executable UML Models (fUML). The reference implementation is intended to implement the execution semantics of UML activity models, accepting an XMI file from a conformant UML model as its input and providing an execution trace of the selected activity model(s) as its output. The core execution engine, which is directly generated from the normative syntactic and semantic models for fUML, may also be used as a library implementation of fUML in other software. http:/fuml.modeldriven.org @@ -38,7 +38,12 @@ UTF-8 - ${project.build.directory}/generated-sources/java + 9.0.0 + 3.0.0 + 2.0.0 + 3.0.0 + 3.0.0 + 5.0.0 @@ -93,138 +98,158 @@ commons-logging 1.1.1 + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.maven.jakarta.xml.bind-api} + + + com.sun.xml.bind + jaxb-impl + ${version.maven.jaxb.impl} + - - - maven-antrun-plugin - 1.7 + org.codehaus.mojo + jaxb2-maven-plugin + 2.5.0 - sun.jdk - tools - 1.5.0 - system - ${java.home}/../lib/tools.jar + org.glassfish.jaxb + jaxb-xjc + ${version.maven.jaxb.xjc} + + + jakarta.activation + jakarta.activation-api + ${version.maven.jakarta.activation.api} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.maven.jakarta.xml.bind-api} + + + com.sun.xml.bind + jaxb-impl + ${version.maven.jaxb.impl} - fuml-config - generate-sources + xjc-config - run + xjc - - - - - - - + + ${basedir}/src/main/resources/org/modeldriven/fuml/jaxb-bindings.xml + + + ${basedir}/src/main/resources/org/modeldriven/fuml/config/FumlConfig.xsd + ${basedir}/src/main/resources/org/modeldriven/fuml/repository/RepositoryConfig.xsd + + ${basedir}/target/generated-sources/java + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0 + - repo-config + copy-file1 generate-sources - run + copy - - - - - - - + ${basedir}/src/main/resources/org/modeldriven/fuml/repository/PrimitiveTypes.xmi + ${basedir}/target/xslt/staging/types/PrimitiveTypesAssembler.xmi - generate-model-factories - + copy-file2 generate-sources + + copy + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + ${basedir}/src/main/resources/org/modeldriven/fuml/repository/UML.xmi + ${basedir}/target/xslt/staging/uml/UMLAssembler.xmi + + + + + org.codehaus.mojo + xml-maven-plugin + 1.0.2 + + - run + transform + + + + ${basedir}/target/xslt/staging/types + ${basedir}/src/main/resources/org/modeldriven/fuml/repository/FumlModelGenerator.xsl + ${basedir}/target/generated-sources/java/org/modeldriven/fuml/repository/model/ + + + pkg + org.modeldriven.fuml.repository.model + + + cls + PrimitiveTypesAssembler + + + + + .java + + + + + ${basedir}/target/xslt/staging/uml + ${basedir}/src/main/resources/org/modeldriven/fuml/repository/FumlModelGenerator.xsl + ${basedir}/target/generated-sources/java/org/modeldriven/fuml/repository/model/ + + + pkg + org.modeldriven.fuml.repository.model + + + cls + UMLAssembler + + + + + .java + + + + + org.apache.maven.plugins maven-compiler-plugin 2.3.2 - 1.6 - 1.6 + 1.8 + 1.8 UTF-8 @@ -247,7 +272,6 @@ - org.apache.maven.plugins maven-javadoc-plugin @@ -259,29 +283,16 @@ jar - -Xdoclint:none - + -Xdoclint:none + - org.codehaus.mojo build-helper-maven-plugin 1.7 - - add-source-1 - generate-sources - - add-source - - - - ${xjc.output.dir} - - - add-source-2 generate-sources @@ -334,7 +345,6 @@ **/library/** **/validation/** - @@ -422,21 +432,6 @@ - - - org.codehaus.mojo - - jaxb2-maven-plugin - - [1.4,) - - xjc - - - - - - org.codehaus.mojo @@ -506,12 +501,4 @@ - - - - - - - - - + \ No newline at end of file diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/BindingValidationEventHandler.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/BindingValidationEventHandler.java index 61332bce..6da6f15c 100644 --- a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/BindingValidationEventHandler.java +++ b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/BindingValidationEventHandler.java @@ -1,16 +1,23 @@ /* * Copyright 2008 Lockheed Martin Corporation, except as stated in the file - * entitled Licensing-Information. All modifications copyright 2009 Data Access Technologies, Inc. Licensed under the Academic Free License - * version 3.0 (http://www.opensource.org/licenses/afl-3.0.php), except as stated + * entitled Licensing-Information. + * + * Modifications: + * Copyright 2009 Data Access Technologies, Inc. (Model Driven Solutions) + * Copyright 2023 Model Driven Solutions, Inc. + * + * Licensed under the Academic Free License version 3.0 + * (http://www.opensource.org/licenses/afl-3.0.php), except as stated * in the file entitled Licensing-Information. * * Contributors: - * MDS - initial API and implementation + * DAT/MDS - initial API and implementation + * MDS - changed from javax.xml to jakarta.xml * */ package org.modeldriven.fuml.bind; -import javax.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.ValidationEventHandler; public interface BindingValidationEventHandler extends ValidationEventHandler { diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DataBinding.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DataBinding.java index 63ffa2be..a8cc3d1a 100644 --- a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DataBinding.java +++ b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DataBinding.java @@ -1,19 +1,26 @@ /* * Copyright 2008 Lockheed Martin Corporation, except as stated in the file - * entitled Licensing-Information. All modifications copyright 2009 Data Access Technologies, Inc. Licensed under the Academic Free License - * version 3.0 (http://www.opensource.org/licenses/afl-3.0.php), except as stated + * entitled Licensing-Information. + * + * Modifications: + * Copyright 2009 Data Access Technologies, Inc. (Model Driven Solutions) + * Copyright 2023 Model Driven Solutions, Inc. + * + * Licensed under the Academic Free License version 3.0 + * (http://www.opensource.org/licenses/afl-3.0.php), except as stated * in the file entitled Licensing-Information. * * Contributors: - * MDS - initial API and implementation + * DAT/MDS - initial API and implementation + * MDS - changed from javax.xml to jakarta.xml * */ package org.modeldriven.fuml.bind; import java.io.InputStream; -import javax.xml.bind.JAXBException; -import javax.xml.bind.UnmarshalException; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.UnmarshalException; public interface DataBinding { diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DataBindingSupport.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DataBindingSupport.java index d5b4ee5f..1fdf2985 100644 --- a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DataBindingSupport.java +++ b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DataBindingSupport.java @@ -1,11 +1,18 @@ /* * Copyright 2008 Lockheed Martin Corporation, except as stated in the file - * entitled Licensing-Information. All modifications copyright 2009 Data Access Technologies, Inc. Licensed under the Academic Free License - * version 3.0 (http://www.opensource.org/licenses/afl-3.0.php), except as stated + * entitled Licensing-Information. + * + * Modifications: + * Copyright 2009 Data Access Technologies, Inc. (Model Driven Solutions) + * Copyright 2023 Model Driven Solutions, Inc. + * + * Licensed under the Academic Free License version 3.0 + * (http://www.opensource.org/licenses/afl-3.0.php), except as stated * in the file entitled Licensing-Information. * * Contributors: - * MDS - initial API and implementation + * DAT/MDS - initial API and implementation + * MDS - changed from javax.xml.bind to jakarta.xml.bind * */ package org.modeldriven.fuml.bind; @@ -14,10 +21,10 @@ import java.io.StringReader; import java.io.StringWriter; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; public class DataBindingSupport { diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DefaultValidationEventHandler.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DefaultValidationEventHandler.java index 76b37022..eb53b179 100644 --- a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DefaultValidationEventHandler.java +++ b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/DefaultValidationEventHandler.java @@ -1,17 +1,24 @@ /* * Copyright 2008 Lockheed Martin Corporation, except as stated in the file - * entitled Licensing-Information. All modifications copyright 2009 Data Access Technologies, Inc. Licensed under the Academic Free License - * version 3.0 (http://www.opensource.org/licenses/afl-3.0.php), except as stated + * entitled Licensing-Information. + * + * Modifications: + * Copyright 2009 Data Access Technologies, Inc. (Model Driven Solutions) + * Copyright 2023 Model Driven Solutions, Inc. + * + * Licensed under the Academic Free License version 3.0 + * (http://www.opensource.org/licenses/afl-3.0.php), except as stated * in the file entitled Licensing-Information. * * Contributors: - * MDS - initial API and implementation + * DAT/MDS - initial API and implementation + * MDS - changed from javax.xml to jakarta.xml * */ package org.modeldriven.fuml.bind; -import javax.xml.bind.ValidationEvent; -import javax.xml.bind.ValidationEventLocator; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.ValidationEventLocator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/ValidatingUnmarshaler.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/ValidatingUnmarshaler.java index 6c8eea3d..9b407ff5 100644 --- a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/ValidatingUnmarshaler.java +++ b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/bind/ValidatingUnmarshaler.java @@ -1,11 +1,18 @@ /* * Copyright 2008 Lockheed Martin Corporation, except as stated in the file - * entitled Licensing-Information. All modifications copyright 2009 Data Access Technologies, Inc. Licensed under the Academic Free License - * version 3.0 (http://www.opensource.org/licenses/afl-3.0.php), except as stated + * entitled Licensing-Information. + * + * Modifications: + * Copyright 2009 Data Access Technologies, Inc. (Model Driven Solutions) + * Copyright 2023 Model Driven Solutions, Inc. + * + * Licensed under the Academic Free License version 3.0 + * (http://www.opensource.org/licenses/afl-3.0.php), except as stated * in the file entitled Licensing-Information. * * Contributors: * MDS - initial API and implementation + * MDS - changed from javax.xml.bind to jakarta.xml.bind * */ package org.modeldriven.fuml.bind; @@ -14,10 +21,10 @@ import java.io.StringReader; import java.net.URL; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.UnmarshalException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.UnmarshalException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/config/FumlConfigDataBinding.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/config/FumlConfigDataBinding.java index a4c513ab..00c217de 100644 --- a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/config/FumlConfigDataBinding.java +++ b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/config/FumlConfigDataBinding.java @@ -1,20 +1,27 @@ /* * Copyright 2008 Lockheed Martin Corporation, except as stated in the file - * entitled Licensing-Information. All modifications copyright 2009 Data Access Technologies, Inc. Licensed under the Academic Free License - * version 3.0 (http://www.opensource.org/licenses/afl-3.0.php), except as stated + * entitled Licensing-Information. + * + * Modifications: + * Copyright 2009 Data Access Technologies, Inc. (Model Driven Solutions) + * Copyright 2023 Model Driven Solutions, Inc. + * + * Licensed under the Academic Free License version 3.0 + * (http://www.opensource.org/licenses/afl-3.0.php), except as stated * in the file entitled Licensing-Information. * * Contributors: - * MDS - initial API and implementation + * DAT/MDS - initial API and implementation + * MDS - changed from javax.xml to jakarta.xml * */ package org.modeldriven.fuml.config; import java.io.InputStream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.UnmarshalException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.UnmarshalException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/config/FumlConfiguration.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/config/FumlConfiguration.java index f7abded9..745f3d26 100644 --- a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/config/FumlConfiguration.java +++ b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/config/FumlConfiguration.java @@ -1,11 +1,18 @@ /* * Copyright 2008 Lockheed Martin Corporation, except as stated in the file - * entitled Licensing-Information. All modifications copyright 2009 Data Access Technologies, Inc. Licensed under the Academic Free License - * version 3.0 (http://www.opensource.org/licenses/afl-3.0.php), except as stated + * entitled Licensing-Information. + * + * Modifications: + * Copyright 2009 Data Access Technologies, Inc. (Model Driven Solutions) + * Copyright 2023 Model Driven Solutions, Inc. + * + * Licensed under the Academic Free License version 3.0 + * (http://www.opensource.org/licenses/afl-3.0.php), except as stated * in the file entitled Licensing-Information. * * Contributors: - * MDS - initial API and implementation + * DAT/MDS - initial API and implementation + * MDS - changed from javax.xml to jakarta.xml * */ package org.modeldriven.fuml.config; @@ -17,9 +24,9 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.UnmarshalException; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.UnmarshalException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/RepositoryConfigDataBinding.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/RepositoryConfigDataBinding.java index 2ac5a67a..c28cc79a 100644 --- a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/RepositoryConfigDataBinding.java +++ b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/RepositoryConfigDataBinding.java @@ -1,20 +1,27 @@ /* * Copyright 2008 Lockheed Martin Corporation, except as stated in the file - * entitled Licensing-Information. All modifications copyright 2009 Data Access Technologies, Inc. Licensed under the Academic Free License - * version 3.0 (http://www.opensource.org/licenses/afl-3.0.php), except as stated + * entitled Licensing-Information. + * + * Modifications: + * Copyright 2009 Data Access Technologies, Inc. (Model Driven Solutions) + * Copyright 2023 Model Driven Solutions, Inc. + * + * Licensed under the Academic Free License version 3.0 + * (http://www.opensource.org/licenses/afl-3.0.php), except as stated * in the file entitled Licensing-Information. * * Contributors: - * MDS - initial API and implementation + * DAT/MDS - initial API and implementation + * MDS - changed from javax.xml.bind to jakarta.xml.bind * */ package org.modeldriven.fuml.repository; import java.io.InputStream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.UnmarshalException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.UnmarshalException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/model/InMemoryRepository.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/model/InMemoryRepository.java index 72c9aeb5..8b82afd2 100644 --- a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/model/InMemoryRepository.java +++ b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/model/InMemoryRepository.java @@ -1,13 +1,18 @@ /* - * Initial version copyright 2008 Lockheed Martin Corporation, except - * as stated in the file entitled Licensing-Information. - * + * Copyright 2008 Lockheed Martin Corporation, except as stated in the file + * entitled Licensing-Information. + * * Modifications: - * Copyright 2009-2017 Data Access Technologies, Inc. + * Copyright 2009-2017 Data Access Technologies, Inc. (Model Driven Solutions) + * Copyright 2023 Model Driven Solutions, Inc. + * + * Licensed under the Academic Free License version 3.0 + * (http://www.opensource.org/licenses/afl-3.0.php), except as stated + * in the file entitled Licensing-Information. * - * Licensed under the Academic Free License version 3.0 - * (http://www.opensource.org/licenses/afl-3.0.php), except as stated - * in the file entitled Licensing-Information. + * Contributors: + * DAT/MDS - initial API and implementation, additional changes + * MDS - changed from javax.xml.bind to jakarta.xml.bind * */ package org.modeldriven.fuml.repository.model; @@ -19,9 +24,9 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.UnmarshalException; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.UnmarshalException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/xmi/XmiValidationEventHandler.java b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/xmi/XmiValidationEventHandler.java index efd236ac..cb5c3074 100644 --- a/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/xmi/XmiValidationEventHandler.java +++ b/org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/xmi/XmiValidationEventHandler.java @@ -1,18 +1,24 @@ /* * Copyright 2008 Lockheed Martin Corporation, except as stated in the file - * entitled Licensing-Information. All modifications copyright 2009 Data Access Technologies, Inc. Licensed under the Academic Free License - * version 3.0 (http://www.opensource.org/licenses/afl-3.0.php), except as stated + * entitled Licensing-Information. + * + * Modifications: + * Copyright 2009 Data Access Technologies, Inc. (Model Driven Solutions) + * Copyright 2023 Model Driven Solutions, Inc. + * + * Licensed under the Academic Free License version 3.0 + * (http://www.opensource.org/licenses/afl-3.0.php), except as stated * in the file entitled Licensing-Information. * * Contributors: - * MDS - initial API and implementation + * DAT/MDS - initial API and implementation + * MDS - changed from javax.xml.bind to jakarta.xml.bind * */ - package org.modeldriven.fuml.xmi; -import javax.xml.bind.ValidationEvent; -import javax.xml.bind.ValidationEventLocator; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.ValidationEventLocator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/config/jaxb-bindings.xml b/org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/config/jaxb-bindings.xml deleted file mode 100644 index 6bd6fb7c..00000000 --- a/org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/config/jaxb-bindings.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - Package level documentation for generated package org.modeldriven.fuml.config.]]> - - - - \ No newline at end of file diff --git a/org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/repository/jaxb-bindings.xml b/org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/jaxb-bindings.xml similarity index 71% rename from org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/repository/jaxb-bindings.xml rename to org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/jaxb-bindings.xml index a01d4724..b2f16bdd 100644 --- a/org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/repository/jaxb-bindings.xml +++ b/org.modeldriven.fuml/src/main/resources/org/modeldriven/fuml/jaxb-bindings.xml @@ -14,6 +14,13 @@ underscoreBinding="asCharInWord"> + + + + Package level documentation for generated package org.modeldriven.fuml.config.]]> + + +