Skip to content

Commit

Permalink
[irods-contrib/metalnx-web#214] Removal of external database code
Browse files Browse the repository at this point in the history
- Reimplemented UserDaoImpl.java to use Jargon calls to iRODS.
- Remove code that involves with favorites, bookmarks, templates, and profiles.
- Remove code for unused user fields.
- Remove references to hibernate and javax.persistence and all database update code.
- Moved UserDaoImpl.java and IRODSServices.java to avoid cyclic dependency.
- Add new required dependency for emc-metalnx-core to depend on jargon-zipservice and jargon-ticket.
- Change build->tasks to build->target as seems to be required due to maven update.
- Remove UserDao dependency on GenericDao.  Remove GenericDao and GenericDaoImpl as these have DB specific functionality.
  • Loading branch information
JustinKyleJames authored and alanking committed Dec 5, 2024
1 parent 04d25a9 commit adef656
Show file tree
Hide file tree
Showing 49 changed files with 452 additions and 4,375 deletions.
32 changes: 14 additions & 18 deletions emc-metalnx-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,6 @@
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate.validator.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
Expand Down Expand Up @@ -91,6 +77,16 @@
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.irods.jargon</groupId>
<artifactId>jargon-zipservice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.irods.jargon</groupId>
<artifactId>jargon-ticket</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down Expand Up @@ -130,7 +126,7 @@
<id>0</id>
<phase>validate</phase>
<configuration>
<tasks>
<target>
<delete
file="${basedir}/src/test/resources/testing.properties" />
<touch
Expand Down Expand Up @@ -193,7 +189,7 @@
test.option.mount.basedir=${test.option.mount.basedir}
test.option.python=${test.option.python}
</echo>
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>
Expand All @@ -204,7 +200,7 @@
<id>2</id>
<phase>validate</phase>
<configuration>
<tasks>
<target>
<delete
file="${basedir}/src/test/resources/test.metalnx.properties" />
<touch
Expand Down Expand Up @@ -285,7 +281,7 @@
resource.location.i18-users=classpath:i18n-users/messages

</echo>
</tasks>
</target>
</configuration>
<goals>
<goal>run</goal>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit adef656

Please sign in to comment.