Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…ionLibrary

* 'master' of https://github.com/paulswithers/XPagesExtensionLibrary:
  Adding searchType to NAB picker Amending "match" search option so everything shows if no search value is entered (previously nothing showed) No changes to AbstractDominoViewPickerData
  Removing bootstrap combobox dialog fix - contributed by Declan
  Fix for comboboxes in dialogs with bootstrap theme. Thanks David Leedy and Declan Lynch - OpenNTF/Bootstrap4XPages#67
  Adding Collection and Map picker data providers
  Cleaning up - didn't need additional constructor. Problem I was trying to fix with that was not authenticated, so no access to NAB
  Adding returnNameFormat for NamePicker
  Cleaning up appendColumnValue
  Adding JDBC Ext functions and Java code, to avoid capitalisation
  Only real changes are: DominoNABNamePickerData, starting work on adding returnNameFormat JDBCUtil adding support for not upper-casing column names

Conflicts:
	extlib-des/lwp/product/design/updatesite/com.ibm.xsp.extlib.designer.tooling.updatesite/site.xml
	extlib/lwp/.project
	extlib/lwp/product/runtime/eclipse/features/.project
	extlib/lwp/product/runtime/eclipse/features/org.openntf.extlib.apache.wink.feature/.project
	extlib/lwp/product/runtime/eclipse/features/org.openntf.extlib.domino.das.feature/.project
	extlib/lwp/product/runtime/eclipse/features/org.openntf.extlib.feature/.project
	extlib/lwp/product/runtime/eclipse/features/org.openntf.extlib.relational.feature/.project
	extlib/lwp/product/runtime/eclipse/features/org.openntf.extlib.wink.feature/.project
	extlib/lwp/product/runtime/eclipse/plugins/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.domino.calendar.dbstore/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.domino.calendar.store/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.domino.commons/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.domino.das/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.domino.services.calendar/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.domino.services/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.wink/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.controls/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.controls/src/com/ibm/xsp/extlib/component/picker/data/CollectionValuePickerData.java
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.controls/src/com/ibm/xsp/extlib/component/picker/data/MapValuePickerData.java
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.controls/src/com/ibm/xsp/extlib/config/extlib-picker.xsp-config
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.controls/src/com/ibm/xsp/extlib/config/extlib-picker_en.properties
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.core/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.domino/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.domino/src/com/ibm/xsp/extlib/component/picker/data/AbstractDominoViewPickerData.java
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.domino/src/com/ibm/xsp/extlib/component/picker/data/DominoNABNamePickerData.java
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.domino/src/com/ibm/xsp/extlib/config/extlib-domino-picker.xsp-config
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.domino/src/com/ibm/xsp/extlib/config/raw-extlib-domino-picker.xsp-config
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.mobile/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.oneui/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.relational/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.relational/src/com/ibm/xsp/extlib/relational/javascript/JdbcFunctions.java
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib.relational/src/com/ibm/xsp/extlib/relational/util/JdbcUtil.java
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.extlib/.project
	extlib/lwp/product/runtime/eclipse/plugins/com.ibm.xsp.theme.bootstrap/.project
	extlib/lwp/product/runtime/eclipse/plugins/org.apache.common.dbcp/.project
	extlib/lwp/product/runtime/eclipse/plugins/org.apache.james.mime4j/.project
	extlib/lwp/product/runtime/eclipse/plugins/org.apache.wink/.project
	extlib/lwp/product/runtime/updatesite/org.openntf.extlib.updatesite/.project
  • Loading branch information
paulswithers committed Jun 14, 2016
2 parents a174610 + 3f2528d commit 588719d
Show file tree
Hide file tree
Showing 103 changed files with 2,483 additions and 2,410 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="images"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/XPages Notes JRE"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="images"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<site>
<feature url="features/com.ibm.xsp.extlib.designer.tooling.feature_9.0.1.v00_17_qualifier.jar" id="com.ibm.xsp.extlib.designer.tooling.feature" version="9.0.1.v00_17_qualifier"/>
<feature url="features/com.ibm.xsp.extlib.feature_9.0.1.v00_17_qualifier.jar" id="com.ibm.xsp.extlib.feature" version="9.0.1.v00_17_qualifier"/>
<feature url="features/com.ibm.domino.das.feature_9.0.1.v00_17_qualifier.jar" id="com.ibm.domino.das.feature" version="9.0.1.v00_17_qualifier"/>
<feature url="features/com.ibm.wink.feature_9.0.1.v00_17_qualifier.jar" id="com.ibm.wink.feature" version="9.0.1.v00_17_qualifier"/>
<feature url="features/org.apache.wink.feature_1.1.2.qualifier.jar" id="org.apache.wink.feature" version="1.1.2.qualifier"/>
</site>
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.openntf.extlib.domino.das.feature_9.0.1.v00_10_SNAPSHOT.jar" id="org.openntf.extlib.domino.das.feature" version="9.0.1.v00_10_SNAPSHOT"/>
<feature url="features/org.openntf.extlib.feature_9.0.1.v00_10_SNAPSHOT.jar" id="org.openntf.extlib.feature" version="9.0.1.v00_10_SNAPSHOT"/>
<feature url="features/org.openntf.extlib.apache.wink.feature_9.0.1.v00_10_SNAPSHOT.jar" id="org.openntf.extlib.apache.wink.feature" version="9.0.1.v00_10_SNAPSHOT"/>
<feature url="features/org.openntf.extlib.wink.feature_9.0.1.v00_10_SNAPSHOT.jar" id="org.openntf.extlib.wink.feature" version="9.0.1.v00_10_SNAPSHOT"/>
<feature url="features/org.openntf.extlib.designer.tooling.feature_9.0.1.v00_10_qualifier.jar" id="org.openntf.extlib.designer.tooling.feature" version="9.0.1.v00_10_qualifier"/>
</site>
7 changes: 6 additions & 1 deletion extlib/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
*.copyarea.db
*.copyarea.db
*.eclipse.m2n.core.prefs
*.eclipse.jdt.core.prefs
*.eclipse.core.resouorces.prefs
*/features/*
*/plugins/*
34 changes: 17 additions & 17 deletions extlib/lwp/.project
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.ibm.xsp.extlib.parent</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.ibm.xsp.extlib.parent</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
4 changes: 4 additions & 0 deletions extlib/lwp/.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
2 changes: 1 addition & 1 deletion extlib/lwp/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<!-- -->
<!-- ******************************************************************* -->

<project name="extlib" default="development" basedir=".">
<project name="extlib" basedir=".">
<import file="${env.WPLC_IMPORT}/std_props.xml"/>

<import file="${env.WPLC_IMPORT}/root_build.xml"/>
Expand Down
34 changes: 17 additions & 17 deletions extlib/lwp/product/runtime/eclipse/features/.project
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>product.runtime.eclipse.features</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>product.runtime.eclipse.features</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
34 changes: 17 additions & 17 deletions extlib/lwp/product/runtime/eclipse/plugins/.project
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>product.runtime.eclipse.plugins</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>product.runtime.eclipse.plugins</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
Expand All @@ -33,7 +28,6 @@
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
Expand All @@ -33,7 +28,6 @@
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Loading

0 comments on commit 588719d

Please sign in to comment.