[#606] remove spring + [#613] make maxIdentifierLength configurable + [#615] custom naming example fix

Author: laurentschoelens

hyperjaxb/ejb/extensions/naming/custom-naming-pre_0_6_0/src/main/resources/org/jvnet/hyperjaxb3/ejb/plugin/custom/applicationContext.xml

@@ -6,9 +6,9 @@
 		<version>4.0.10-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<artifactId>hyperjaxb3-ejb-extensions-custom-naming-pre_0_6_0</artifactId>
+	<artifactId>hyperjaxb3-ejb-extensions-custom-naming</artifactId>
 	<packaging>jar</packaging>
-	<name>JAXB Tools :: Hyperjaxb3 :: EJB :: Extensions :: Naming [custom-naming-pre_0_6_0]</name>
+	<name>JAXB Tools :: Hyperjaxb3 :: EJB :: Extensions :: Naming [custom-naming]</name>
 
 	<dependencies>
 		<dependency>

hyperjaxb/ejb/extensions/naming/custom-naming-pre_0_6_0/pom.xml renamed to hyperjaxb/ejb/extensions/naming/custom-naming/pom.xml

@@ -0,0 +1,15 @@
+package org.jvnet.hyperjaxb3.ejb.extensions.naming.impl;
+
+import org.jvnet.hyperjaxb3.ejb.IApplicationContext;
+import org.jvnet.hyperjaxb3.ejb.strategy.ignoring.Ignoring;
+import org.jvnet.hyperjaxb3.ejb.strategy.naming.impl.DefaultNaming;
+
+import java.util.Properties;
+
+public class CustomApplicationContext implements IApplicationContext {
+
+    @Override
+    public DefaultNaming createNaming(Ignoring ignoring, Properties reservedNames) {
+        return new CustomSimpleNoUnderscoreNaming(ignoring, reservedNames);
+    }
+}

hyperjaxb/ejb/extensions/naming/custom-naming/src/main/java/org/jvnet/hyperjaxb3/ejb/extensions/naming/impl/CustomApplicationContext.java

@@ -1,10 +1,17 @@
-package org.jvnet.hyperjaxb3.ejb.extensions.naming.pre_0_6_0.impl;
+package org.jvnet.hyperjaxb3.ejb.extensions.naming.impl;
 
+import org.jvnet.hyperjaxb3.ejb.strategy.ignoring.Ignoring;
 import org.jvnet.hyperjaxb3.ejb.strategy.mapping.Mapping;
 import org.jvnet.hyperjaxb3.ejb.strategy.naming.impl.DefaultNaming;
 
+import java.util.Properties;
+
 public class CustomSimpleNoUnderscoreNaming extends DefaultNaming {
-	
+
+    public CustomSimpleNoUnderscoreNaming(Ignoring ignoring, Properties reservedNames) {
+        super(ignoring, reservedNames);
+    }
+
 	@Override
 	public String getName(Mapping context, final String draftName) {
 		String name = super.getName(context, draftName);

hyperjaxb/ejb/extensions/naming/custom-naming-pre_0_6_0/src/main/java/org/jvnet/hyperjaxb3/ejb/extensions/naming/pre_0_6_0/impl/CustomSimpleNoUnderscoreNaming.java renamed to hyperjaxb/ejb/extensions/naming/custom-naming/src/main/java/org/jvnet/hyperjaxb3/ejb/extensions/naming/impl/CustomSimpleNoUnderscoreNaming.java

@@ -11,6 +11,6 @@
 	<name>JAXB Tools :: Hyperjaxb3 :: EJB :: Extensions :: Naming</name>
 
 	<modules>
-		<module>custom-naming-pre_0_6_0</module>
+		<module>custom-naming</module>
 	</modules>
 </project>

hyperjaxb/ejb/extensions/naming/pom.xml

@@ -27,14 +27,6 @@
 			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>jaxb-plugins-tools</artifactId>
 		</dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-    </dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>hyperjaxb3-ejb-roundtrip</artifactId>

hyperjaxb/ejb/plugin/pom.xml

@@ -0,0 +1,24 @@
+package org.jvnet.hyperjaxb3.beans.factory;
+
+import java.util.Map;
+
+import jakarta.xml.bind.JAXBContext;
+
+public class JAXBContextFactory {
+
+	public static JAXBContext createInstance(String contextPath) throws Exception {
+        return JAXBContext.newInstance(contextPath);
+    }
+
+    public static JAXBContext createInstance(String contextPath, ClassLoader classLoader) throws Exception {
+        return JAXBContext.newInstance(contextPath, classLoader);
+    }
+
+    public static JAXBContext createInstance(String contextPath, Map<String, ?> properties) throws Exception {
+        return JAXBContext.newInstance(contextPath, Thread.currentThread().getContextClassLoader(), properties);
+    }
+
+    public static JAXBContext createInstance(String contextPath, ClassLoader classLoader, Map<String, ?> properties) throws Exception {
+        return JAXBContext.newInstance(contextPath, classLoader, properties);
+    }
+}

hyperjaxb/ejb/plugin/src/main/java/org/jvnet/hyperjaxb3/beans/factory/JAXBContextFactory.java

@@ -0,0 +1,22 @@
+package org.jvnet.hyperjaxb3.beans.factory;
+
+import java.io.InputStream;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+
+import org.xml.sax.InputSource;
+
+public class UnmarshalledResourceFactory {
+
+	public static Object createInstance(InputStream stream, String systemId, JAXBContext context) throws Exception {
+		final InputSource inputSource = new InputSource(stream);
+        inputSource.setSystemId(systemId);
+		final Object unmarshallingResult = context.createUnmarshaller().unmarshal(inputSource);
+		if (unmarshallingResult instanceof JAXBElement<?>) {
+			return ((JAXBElement<?>) unmarshallingResult).getValue();
+		} else {
+			return unmarshallingResult;
+		}
+	}
+}