Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge hyperjaxb3 in subfolder hyperjaxb #320

Merged
merged 72 commits into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
1ffa04a
Initial commit
highsource Sep 14, 2014
0882517
Initial commit.
highsource Sep 14, 2014
e7c4233
Minor changes.
highsource Sep 14, 2014
24e2f96
Second commit.
highsource Sep 15, 2014
625f9a2
Second commit.
highsource Sep 15, 2014
4421012
Second commit.
highsource Sep 15, 2014
a691e6b
Tutorials.
highsource Sep 15, 2014
28eba01
Second commit.
highsource Sep 15, 2014
d5fd433
Samples.
highsource Sep 15, 2014
1242ec4
Second commit.
highsource Sep 15, 2014
4c8a677
Preparing the 0.6.0 release.
highsource Sep 15, 2014
3b59a10
Version 0.6.0
highsource Sep 16, 2014
5778550
Version 0.6.1-SNAPSHOT
highsource Sep 16, 2014
3092d29
Ignores.
highsource Sep 16, 2014
bed1183
Custom naming pre 0.6.0 version behavior
pethers Sep 17, 2014
4ff9bfd
clenup
pethers Sep 17, 2014
05add40
Merge pull request #10 from pethers/master
highsource Sep 17, 2014
b9a61d8
Issue #10.
highsource Sep 17, 2014
cceb9b4
Updated the files.
highsource Oct 9, 2014
c8c8f68
Issue #12.
highsource Oct 16, 2014
c07da73
Test project removed.
highsource Oct 16, 2014
7964ca4
Test [po-jpa-2.1].
highsource Nov 8, 2014
f551bab
Updated POMs of test projects.
highsource Nov 8, 2014
f7929e3
Updated the tutorial POMs.
highsource Nov 8, 2014
ad7f3cd
Upgraded to XJC 2.2.11.
highsource Nov 8, 2014
b942be0
Updated POMs for issue #13 and issue #14.
highsource Nov 8, 2014
b1b9b2c
Updated the test class because of the HSQLDB 2.3.2 upgrade.
highsource Nov 8, 2014
cb44a2a
Eclipse files.
highsource Nov 8, 2014
8820692
Removed the obsolete class.
highsource Nov 8, 2014
1316268
Small corrections to make tests run.
highsource Nov 8, 2014
9b57a1c
Component Tests for ignoring Some Classes
vkrishnap Jan 28, 2015
3b52a7e
Merge pull request #17 from vkrishnap/master
highsource Jan 28, 2015
c7d626b
Issue #18.
highsource Jan 28, 2015
b5f0dfe
Issue #18.
highsource Jan 28, 2015
f66b232
Issue #20.
highsource Feb 10, 2015
602378e
Issue #21.
highsource Feb 10, 2015
6c69767
Fixes #24.
highsource Nov 23, 2015
5a8d6a7
Issue #24.
highsource Nov 25, 2015
1ed65a1
Issue #24.
highsource Nov 25, 2015
7135dde
Issue #24.
highsource Nov 25, 2015
61ba79f
Version 0.6.1
highsource Nov 25, 2015
85852e6
Version 0.6.2-SNAPSHOT
highsource Nov 26, 2015
2955766
Version 0.6.1
highsource Nov 26, 2015
10ad0e1
Issue #24.
highsource Nov 26, 2015
18da68b
Version 0.6.1
highsource Nov 26, 2015
2d342e9
Issue #24.
highsource Nov 26, 2015
ea516d5
Version 0.6.1
highsource Nov 26, 2015
45c9bb7
Issue #24.
highsource Nov 26, 2015
18f1289
Version 0.6.1
highsource Nov 26, 2015
6a65223
Version 0.6.2-SNAPSHOT
highsource Nov 26, 2015
d7fa687
add CONDITION to the reserved names list
Aug 30, 2017
ffbd4e1
Merge pull request #39 from bgedik/bugfix/38-condition-as-reserved-word
highsource Aug 30, 2017
01278fe
Make HyperJAXB3 compilable under JDK 1.8 and Apache Maven >=3.3.*
archenroot Aug 31, 2017
0107664
Merge pull request #40 from archenroot/master
highsource Aug 31, 2017
e06939a
Fixes #35.
highsource Aug 31, 2017
cc84339
Merge pull request #1 from highsource/master
bgedik Sep 4, 2017
e9af1ff
fix build issue due to incorrect artifact name
Sep 4, 2017
1ee0d15
Merge pull request #42 from bgedik/bugfix/41_project_build_failure
highsource Sep 4, 2017
51a4672
Preparing release 0.6.2.
highsource Sep 4, 2017
4e513d9
Version 0.6.2
highsource Sep 4, 2017
bf316b6
Version 0.6.3-SNAPSHOT
highsource Sep 4, 2017
59ae355
Reverting the release
highsource Sep 5, 2017
3c8c0ed
Reverting the release
highsource Sep 5, 2017
41cad15
Version 0.6.2
highsource Sep 5, 2017
cb127c6
Version 0.6.3-SNAPSHOT
highsource Sep 5, 2017
c645d16
Fixes an NPE in DefaultGetTypes.
highsource Jun 4, 2018
d86941c
Bump mysql-connector-java from 5.0.5 to 8.0.16 in /ejb/tests/po-mysql
dependabot[bot] Jul 1, 2020
b614fc6
Merge pull request #58 from highsource/dependabot/maven/ejb/tests/po-…
highsource Sep 9, 2020
12a0df9
Bump commons-beanutils from 1.7.0 to 1.9.4
dependabot[bot] Sep 9, 2020
bd0f2e9
Merge pull request #59 from highsource/dependabot/maven/commons-beanu…
dependabot[bot] Sep 9, 2020
37940ad
Issue #317 : Merge remote-tracking branch 'hyperjaxb3/master' into jt…
laurentschoelens Aug 22, 2023
02ae97b
mv hyperjaxb3 code to hyperjaxb folder
laurentschoelens Aug 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion deploy.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
call mvn -DperformRelease -DcontinuousIntegrationDeploy clean deploy >std 2>err
call mvn -DperformRelease -DcontinuousIntegrationDeploy clean deploy >std 2>err
12 changes: 12 additions & 0 deletions hyperjaxb/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>hyperjaxb3</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions hyperjaxb/.settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
4 changes: 4 additions & 0 deletions hyperjaxb/.settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
4 changes: 4 additions & 0 deletions hyperjaxb/build-1.6.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
setlocal
set JAVA_HOME=%JAVA6_HOME%
call mvn -X clean install >std 2>err
endlocal
1 change: 1 addition & 0 deletions hyperjaxb/dist/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/files/
108 changes: 108 additions & 0 deletions hyperjaxb/dist/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>hyperjaxb3-dist</artifactId>
<packaging>pom</packaging>
<name>Hyperjaxb3 Distribution</name>
<parent>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>hyperjaxb3</artifactId>
<version>0.6.3-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hyperjaxb3-ejb-samples-po-initial</artifactId>
<type>zip</type>
<classifier>maven-src</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hyperjaxb3-ejb-samples-po-initial</artifactId>
<type>zip</type>
<classifier>ant-src</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hyperjaxb3-ejb-samples-po-customized-toplink</artifactId>
<type>zip</type>
<classifier>maven-src</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hyperjaxb3-ejb-samples-po-customized-toplink</artifactId>
<type>zip</type>
<classifier>ant-src</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hyperjaxb3-ejb-samples-uniprot</artifactId>
<type>zip</type>
<classifier>maven-src</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hyperjaxb3-ejb-samples-uniprot</artifactId>
<type>zip</type>
<classifier>ant-src</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hyperjaxb3-ejb-samples-po-maven-jaxb2-plugin</artifactId>
<type>zip</type>
<classifier>maven-src</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hyperjaxb3-ejb-template-basic</artifactId>
<type>zip</type>
<classifier>maven-src</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hyperjaxb3-ejb-template-basic</artifactId>
<type>zip</type>
<classifier>ant-src</classifier>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>files</outputDirectory>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<includeScope>runtime</includeScope>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 2 additions & 0 deletions hyperjaxb/ejb/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
target
/extensions/hyperjaxb3-ejb-extensions.iml
4 changes: 4 additions & 0 deletions hyperjaxb/ejb/build-1.5.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
setlocal
set JAVA_HOME=%JAVA5_HOME%
call mvn -X clean install >std 2>err
endlocal
4 changes: 4 additions & 0 deletions hyperjaxb/ejb/build-1.6.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
setlocal
set JAVA_HOME=%JAVA6_HOME%
call mvn -X clean install >std 2>err
endlocal
4 changes: 4 additions & 0 deletions hyperjaxb/ejb/build-full-1.5.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
setlocal
set JAVA_HOME=%JAVA5_HOME%
call mvn -X -P samples,templates,tests,fullTests clean install >std 2>err
endlocal
4 changes: 4 additions & 0 deletions hyperjaxb/ejb/build-full-1.6.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
setlocal
set JAVA_HOME=%JAVA6_HOME%
call mvn -X -P samples,templates,tests,fullTests clean install >std 2>err
endlocal
1 change: 1 addition & 0 deletions hyperjaxb/ejb/deploy.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mvn -P samples,templates clean install
Binary file added hyperjaxb/ejb/etc/ejb-3_0-fr-spec-persistence.pdf
Binary file not shown.
Binary file not shown.
Binary file added hyperjaxb/ejb/etc/persistence-2_0-final-spec.pdf
Binary file not shown.
Binary file added hyperjaxb/ejb/etc/persistence-2_4-pfd2-spec.pdf
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target
24 changes: 24 additions & 0 deletions hyperjaxb/ejb/extensions/naming/custom-naming-pre_0_6_0/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>hyperjaxb3-ejb-extensions-naming</artifactId>
<version>0.6.3-SNAPSHOT</version>
</parent>
<artifactId>hyperjaxb3-ejb-extensions-custom-naming-pre_0_6_0</artifactId>
<packaging>jar</packaging>
<name>Hyperjaxb3 EJB Extensions Naming [custom-naming-pre_0_6_0]</name>
<dependencies>
<dependency>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>hyperjaxb3-ejb-plugin</artifactId>
<!--version>${project.version}</version-->
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<defaultGoal>install</defaultGoal>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package org.jvnet.hyperjaxb3.ejb.extensions.naming.pre_0_6_0.impl;

import org.jvnet.hyperjaxb3.ejb.strategy.mapping.Mapping;
import org.jvnet.hyperjaxb3.ejb.strategy.naming.impl.DefaultNaming;

public class CustomSimpleNoUnderscoreNaming extends DefaultNaming {

@Override
public String getName(Mapping context, final String draftName) {
String name = super.getName(context, draftName);
if (name.startsWith("_")){
return "_" + name.replace("_", "");
} else {
return name.replace("_", "");
}
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">

<bean name="naming" class="org.jvnet.hyperjaxb3.ejb.extensions.naming.pre_0_6_0.impl.CustomSimpleNoUnderscoreNaming">
<property name="reservedNames" ref="reservedNames"/>
<property name="ignoring" ref="ignoring"/>
</bean>

</beans>
16 changes: 16 additions & 0 deletions hyperjaxb/ejb/extensions/naming/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>hyperjaxb3-ejb-extensions</artifactId>
<version>0.6.3-SNAPSHOT</version>
</parent>
<artifactId>hyperjaxb3-ejb-extensions-naming</artifactId>
<packaging>pom</packaging>
<name>Hyperjaxb3 EJB Extensions Naming</name>
<modules>
<module>custom-naming-pre_0_6_0</module>
</modules>
</project>
16 changes: 16 additions & 0 deletions hyperjaxb/ejb/extensions/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>hyperjaxb3-ejb</artifactId>
<version>0.6.3-SNAPSHOT</version>
</parent>
<artifactId>hyperjaxb3-ejb-extensions</artifactId>
<packaging>pom</packaging>
<name>Hyperjaxb3 EJB Extensions</name>
<modules>
<module>naming</module>
</modules>
</project>
1 change: 1 addition & 0 deletions hyperjaxb/ejb/install.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mvn -P samples,templates,tests clean install
4 changes: 4 additions & 0 deletions hyperjaxb/ejb/plugin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/target
.settings
.classpath
.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
5 changes: 5 additions & 0 deletions hyperjaxb/ejb/plugin/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6
4 changes: 4 additions & 0 deletions hyperjaxb/ejb/plugin/.settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
81 changes: 81 additions & 0 deletions hyperjaxb/ejb/plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>hyperjaxb3-ejb-plugin</artifactId>
<packaging>jar</packaging>
<name>Hyperjaxb3 EJB Plugin</name>
<parent>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>hyperjaxb3-ejb</artifactId>
<version>0.6.3-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.jvnet.annox</groupId>
<artifactId>annox</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-annotate</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-tools</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>hyperjaxb3-ejb-roundtrip</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>hyperjaxb3-ejb-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>hyperjaxb3-ejb-schemas-persistence</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>hyperjaxb3-ejb-schemas-customizations</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
<scope>provided</scope>
</dependency>
<!--dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
</dependency-->
<!--dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</dependency-->
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
</dependencies>
<build>
<defaultGoal>install</defaultGoal>
</build>
</project>
Loading