From 55bd3387f40dce3486968a7b99f3c89ca5a7d826 Mon Sep 17 00:00:00 2001 From: Abhishek Pai Date: Fri, 12 Jul 2024 14:16:44 +0200 Subject: [PATCH 1/5] directory-single has been depracated so that single can be used. --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index fdc5fa16..c8f9165c 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,6 @@ package - directory-single single From 3de6aef58ce33fcb0c635603896d5c0215e88565 Mon Sep 17 00:00:00 2001 From: Abhishek Pai Date: Fri, 12 Jul 2024 14:17:29 +0200 Subject: [PATCH 2/5] Removed in izpack v5.2.0+ and wasn't functioning without classifiers specified anyway. --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8f9165c..7ae1c2a4 100644 --- a/pom.xml +++ b/pom.xml @@ -258,7 +258,6 @@ src/install/install.xml true ${project.artifactId}-${project.version}-installer.jar - false true From 1b4abf2f8acf0c688f8942a516833f8e0f0ef8cf Mon Sep 17 00:00:00 2001 From: Abhishek Pai Date: Fri, 12 Jul 2024 15:12:41 +0200 Subject: [PATCH 3/5] Fixed issue building installer with izpack v5.2.1. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7ae1c2a4..34208b61 100644 --- a/pom.xml +++ b/pom.xml @@ -254,8 +254,8 @@ - ${project.build.directory}/${project.build.finalName}-dist/lsc-${project.version} - src/install/install.xml + ${project.basedir} + ${project.basedir}/src/install/install.xml true ${project.artifactId}-${project.version}-installer.jar true From bf2860c40653fee2fa16e9cb8cfe61a25b1b49e7 Mon Sep 17 00:00:00 2001 From: Abhishek Pai Date: Fri, 12 Jul 2024 16:08:43 +0200 Subject: [PATCH 4/5] Fixing javadoc WARNING messages. --- src/main/java/org/lsc/AbstractSynchronize.java | 15 ++++++--------- .../org/lsc/jndi/AbstractSimpleJndiService.java | 2 +- src/main/java/org/lsc/jndi/JndiServices.java | 10 +++++----- .../java/org/lsc/jndi/ScriptableJndiServices.java | 4 ++-- .../java/org/lsc/service/AbstractJdbcService.java | 2 +- .../java/org/lsc/service/MultipleDstService.java | 2 +- .../java/org/lsc/service/XALdifDstService.java | 2 +- src/main/java/org/lsc/utils/RhinoDebugger.java | 2 +- src/main/java/org/lsc/utils/SetUtils.java | 11 ++++------- 9 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/lsc/AbstractSynchronize.java b/src/main/java/org/lsc/AbstractSynchronize.java index 9fac88ff..23864204 100644 --- a/src/main/java/org/lsc/AbstractSynchronize.java +++ b/src/main/java/org/lsc/AbstractSynchronize.java @@ -320,8 +320,8 @@ public final String getTaskFullStatus(final String syncName) { /** * Log all effective action. * - * @param jm List of modification to do on the Ldap server - * @param identifier object identifier + * @param lm List of modification to do on the Ldap server + * @param data object identifier * @param except synchronization process name */ public final void logActionError(final LscModifications lm, @@ -340,7 +340,7 @@ public final void logActionError(final LscModifications lm, /** * Log all effective action. * - * @param jm List of modification to do on the Ldap server + * @param lm List of modification to do on the Ldap server * @param id object identifier * @param syncName synchronization process name */ @@ -372,9 +372,8 @@ public final void logAction(final LscModifications lm, } /** - * @param jm - * @param id - * @param syncName + * @param lm List of modification to do on the Ldap server + * @param syncName synchronization process name */ public final void logShouldAction(final LscModifications lm, final String syncName) { switch (lm.getOperation()) { @@ -412,12 +411,10 @@ protected void logStatus(InfoCounter counter) { } protected String getLogStatus(InfoCounter counter) { - String totalsLogMessage = - "All entries: "+ counter.getCountAll() + + return "All entries: "+ counter.getCountAll() + ", to modify entries: "+ counter.getCountModifiable() + ", successfully modified entries: "+counter.getCountCompleted()+ ", errors: "+counter.getCountError(); - return totalsLogMessage; } public IBean getBean(Task task, IService service, String pivotName, LscDatasets pivotAttributes, boolean fromSameService, boolean fromSource) throws LscServiceException { diff --git a/src/main/java/org/lsc/jndi/AbstractSimpleJndiService.java b/src/main/java/org/lsc/jndi/AbstractSimpleJndiService.java index 72a11c3a..6da8aac7 100644 --- a/src/main/java/org/lsc/jndi/AbstractSimpleJndiService.java +++ b/src/main/java/org/lsc/jndi/AbstractSimpleJndiService.java @@ -327,7 +327,7 @@ public final String getFilterId() { /** - * @see org.lsc.service.IService.getSupportedConnectionType() + * @see org.lsc.service.IService#getSupportedConnectionType() */ public Collection> getSupportedConnectionType() { Collection> list = new ArrayList>(); diff --git a/src/main/java/org/lsc/jndi/JndiServices.java b/src/main/java/org/lsc/jndi/JndiServices.java index 1b65c962..97b3222f 100644 --- a/src/main/java/org/lsc/jndi/JndiServices.java +++ b/src/main/java/org/lsc/jndi/JndiServices.java @@ -1080,10 +1080,10 @@ public Map getAttrsList(final String base, /** * Retrieve a specific attribute from an object * - * @param objectDn - * @param attribute - * @return - * @throws LscServiceException + * @param objectDn Distinguished Name of object attributes + * @param attribute Attributes returned by query + * @return List of objects returned from Source + * @throws LscServiceException Thrown when LSC fails to general issues */ public List getAttributeValues(String objectDn, String attribute) throws LscServiceException { List values = null; @@ -1262,7 +1262,7 @@ public LdapContext getContext() throws NamingException { * Get the initial JNDI context or get a derived context to be able to use controls without * impacting or being impacted by other threads sharing a same context * @param forUpdates if this derived context is for updates - * @return + * @return {@link LdapContext} object for LDAPv3 connection * @throws NamingException */ public LdapContext getContext(boolean forUpdates) throws NamingException { diff --git a/src/main/java/org/lsc/jndi/ScriptableJndiServices.java b/src/main/java/org/lsc/jndi/ScriptableJndiServices.java index 4bd0cdcb..c43e15ad 100644 --- a/src/main/java/org/lsc/jndi/ScriptableJndiServices.java +++ b/src/main/java/org/lsc/jndi/ScriptableJndiServices.java @@ -135,7 +135,7 @@ protected final List _list(final String base, final String filter) throw * * @param base The base DN to search from. * @param filter The LDAP filter to use. - * @attribute attribute The attribute to search. + * @param attribute The attribute to search. * @return List List of attributes values returned by the search. * @throws NamingException */ @@ -150,7 +150,7 @@ public final List searchAttribute(final Object base, final Object filter * * @param base The base DN to search from. * @param filter The LDAP filter to use. - * @attribute attribute The attribute to search. + * @param attribute The attribute to search. * @return List List of attributes values returned by the search. * @throws NamingException */ diff --git a/src/main/java/org/lsc/service/AbstractJdbcService.java b/src/main/java/org/lsc/service/AbstractJdbcService.java index a2603da8..9ff1c00e 100644 --- a/src/main/java/org/lsc/service/AbstractJdbcService.java +++ b/src/main/java/org/lsc/service/AbstractJdbcService.java @@ -294,7 +294,7 @@ public static String getValue(Object value) { /** - * @see org.lsc.service.IService.getSupportedConnectionType() + * @see org.lsc.service.IService#getSupportedConnectionType() */ public Collection> getSupportedConnectionType() { Collection> list = new ArrayList>(); diff --git a/src/main/java/org/lsc/service/MultipleDstService.java b/src/main/java/org/lsc/service/MultipleDstService.java index 80838073..d9771a04 100644 --- a/src/main/java/org/lsc/service/MultipleDstService.java +++ b/src/main/java/org/lsc/service/MultipleDstService.java @@ -169,7 +169,7 @@ public List getWriteDatasetIds() { } /** - * @see org.lsc.service.IService.getSupportedConnectionType() + * @see org.lsc.service.IService#getSupportedConnectionType() */ public Collection> getSupportedConnectionType() { Collection> list = new ArrayList>(); diff --git a/src/main/java/org/lsc/service/XALdifDstService.java b/src/main/java/org/lsc/service/XALdifDstService.java index 9c937efc..0982d48b 100644 --- a/src/main/java/org/lsc/service/XALdifDstService.java +++ b/src/main/java/org/lsc/service/XALdifDstService.java @@ -263,7 +263,7 @@ public List getWriteDatasetIds() { /** - * @see org.lsc.service.IService.getSupportedConnectionType() + * @see org.lsc.service.IService#getSupportedConnectionType() */ public Collection> getSupportedConnectionType() { Collection> list = new ArrayList>(); diff --git a/src/main/java/org/lsc/utils/RhinoDebugger.java b/src/main/java/org/lsc/utils/RhinoDebugger.java index d07da7cf..dc9f5816 100755 --- a/src/main/java/org/lsc/utils/RhinoDebugger.java +++ b/src/main/java/org/lsc/utils/RhinoDebugger.java @@ -118,7 +118,7 @@ public void run() { /** * Is Debugger visible? * - * @return + * @return true if {@link SwingGui} is visible */ public boolean isVisible() { return debugGui != null && debugGui.isVisible(); diff --git a/src/main/java/org/lsc/utils/SetUtils.java b/src/main/java/org/lsc/utils/SetUtils.java index 59416c6e..968ee32e 100644 --- a/src/main/java/org/lsc/utils/SetUtils.java +++ b/src/main/java/org/lsc/utils/SetUtils.java @@ -68,8 +68,7 @@ private SetUtils() { * Return a new HashSet containing all the Objects that are an Attribute's * values. * - * @param attr - * An Attribute containing values to extract. + * @param attr An Attribute containing values to extract. * @return {@link HashSet} Values as a set. Never null. * @throws NamingException */ @@ -207,11 +206,9 @@ public static Set findMissingNeedles(Set haystack, Set needle * in the same order. This method is type-aware and will intelligently compare * byte[], String, etc. * - * @param first - * First set of Objects to compare. - * @param second - * Second set of Objects. - * @return {@link boolean} if the order is the same. + * @param first First set of Objects to compare. + * @param second Second set of Objects. + * @return true if the order is the same. */ public static boolean checkOrder(Set first, Set second) { if (first.size() != second.size()) { From d0dd138c82362d11f77e994bce8c52f1ec44b3ee Mon Sep 17 00:00:00 2001 From: Abhishek Pai Date: Fri, 12 Jul 2024 17:07:20 +0200 Subject: [PATCH 5/5] Reverted changes. --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34208b61..02b31de8 100644 --- a/pom.xml +++ b/pom.xml @@ -241,6 +241,7 @@ package + directory-single single @@ -254,7 +255,7 @@ - ${project.basedir} + ${project.build.directory}/${project.build.finalName}-dist/lsc-${project.version} ${project.basedir}/src/install/install.xml true ${project.artifactId}-${project.version}-installer.jar