# HG changeset patch # User Daniele Nicolodi # Date 1323098406 -3600 # Node ID e3c5468b1bfeded62ef038875e0821cf4460fafc # Parent 960fe1aa1c10b7b23fa89032f2c816eb96081362 Integrate with LTPDAPreferences diff -r 960fe1aa1c10 -r e3c5468b1bfe m-toolbox/classes/@LTPDADatabaseConnectionManager/LTPDADatabaseConnectionManager.m --- a/m-toolbox/classes/@LTPDADatabaseConnectionManager/LTPDADatabaseConnectionManager.m Mon Dec 05 16:20:06 2011 +0100 +++ b/m-toolbox/classes/@LTPDADatabaseConnectionManager/LTPDADatabaseConnectionManager.m Mon Dec 05 16:20:06 2011 +0100 @@ -5,10 +5,6 @@ connections = {}; credentials = {}; - p_credentialsExpiry = 3600; - p_cachePassword = 2; - p_maxConnectionsNumber = 10; - end % private properties properties(Dependent=true) @@ -83,22 +79,22 @@ function val = get.credentialsExpiry(cm) % obtain from user preferences - %p = getappdata(0, 'LTPDApreferences'); - val = cm.p_credentialsExpiry; + p = getappdata(0, 'LTPDApreferences'); + val = double(p.getRepoPrefs().getExpiry()); end function val = get.cachePassword(cm) % obtain from user preferences - %p = getappdata(0, 'LTPDApreferences'); - val = cm.p_cachePassword; + p = getappdata(0, 'LTPDApreferences'); + val = double(p.getRepoPrefs().getCachePassword()); end function val = get.maxConnectionsNumber(cm) % obtain from user preferences - %p = getappdata(0, 'LTPDApreferences'); - val = cm.p_maxConnectionsNumber; + p = getappdata(0, 'LTPDApreferences'); + val = double(p.getRepoPrefs().getMaxConnectionsNumber()); end diff -r 960fe1aa1c10 -r e3c5468b1bfe src/MPipeline2/nbproject/build-impl.xml --- a/src/MPipeline2/nbproject/build-impl.xml Mon Dec 05 16:20:06 2011 +0100 +++ b/src/MPipeline2/nbproject/build-impl.xml Mon Dec 05 16:20:06 2011 +0100 @@ -55,21 +55,84 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -104,6 +167,7 @@ + @@ -119,12 +183,22 @@ - + + + + + - - + + + + + + + + @@ -151,11 +225,13 @@ - + + + @@ -165,7 +241,8 @@ - + + @@ -174,11 +251,53 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -195,14 +314,19 @@ Must set javac.includes - + + + - + + + + @@ -213,7 +337,8 @@ - + + @@ -228,11 +353,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + @@ -284,10 +455,11 @@ + - - + + @@ -308,8 +480,9 @@ - - + + + @@ -323,20 +496,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + @@ -359,12 +599,18 @@ - + + + + + + + @@ -397,75 +643,65 @@ - + - + - + - To run this application from the command line without Ant, try: + To run this application from the command line without Ant, try: - java -cp "${run.classpath.with.dist.jar}" ${main.class} + java -cp "${run.classpath.with.dist.jar}" ${main.class} + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: + + + + + + + + + + + To run this application from the command line without Ant, try: - java -jar "${dist.jar.resolved}" + java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - + + + + + - + + + + + + + + + + + Must select one file in the IDE or set profile.class + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + @@ -568,8 +879,8 @@ - - + + @@ -583,10 +894,10 @@ - + Must select some files in the IDE or set javac.includes - + @@ -623,7 +934,7 @@ Some tests failed; see details above. - + - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + diff -r 960fe1aa1c10 -r e3c5468b1bfe src/MPipeline2/nbproject/genfiles.properties --- a/src/MPipeline2/nbproject/genfiles.properties Mon Dec 05 16:20:06 2011 +0100 +++ b/src/MPipeline2/nbproject/genfiles.properties Mon Dec 05 16:20:06 2011 +0100 @@ -4,8 +4,8 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=2529af0d -nbproject/build-impl.xml.script.CRC32=a08e85a1 -nbproject/build-impl.xml.stylesheet.CRC32=5c621a33@1.26.1.45 +nbproject/build-impl.xml.script.CRC32=dd4ee7f7 +nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45 nbproject/profiler-build-impl.xml.data.CRC32=75b02ef4 nbproject/profiler-build-impl.xml.script.CRC32=abda56ed nbproject/profiler-build-impl.xml.stylesheet.CRC32=42cb6bcf diff -r 960fe1aa1c10 -r e3c5468b1bfe src/MPipeline2/src/mpipeline/ltpdapreferences/RepositoryPrefGroup.java --- a/src/MPipeline2/src/mpipeline/ltpdapreferences/RepositoryPrefGroup.java Mon Dec 05 16:20:06 2011 +0100 +++ b/src/MPipeline2/src/mpipeline/ltpdapreferences/RepositoryPrefGroup.java Mon Dec 05 16:20:06 2011 +0100 @@ -23,9 +23,13 @@ public static final int REPOSITORY_HOSTNAMES_CHANGED = 1; public static final int REPOSITORY_EXPIRY_CHANGED = 2; - + public static final int REPOSITORY_CACHE_PASSWORD_CHANGED = 3; + public static final int REPOSITORY_MAX_CONNECTIONS_NUMBER_CHANGED = 4; + private ArrayList hostnames = new ArrayList(); private Integer expiry = 60; + private Integer cachePassword = 2; + private Integer maxConnectionsNumber = 10; public RepositoryPrefGroup() { } @@ -91,13 +95,35 @@ notifyObservers(REPOSITORY_HOSTNAMES_CHANGED); } - public void display() { - System.out.println("Hostnames: " + hostnames); - } - public void removeHostnames(Object objs[]) { hostnames.removeAll(Arrays.asList(objs)); this.setChanged(); this.notifyObservers(REPOSITORY_HOSTNAMES_CHANGED); } + + public Integer getCachePassword() { + return cachePassword; + } + + public void setCachePassword(Integer value) { + cachePassword = value; + setChanged(); + notifyObservers(REPOSITORY_CACHE_PASSWORD_CHANGED); + } + + public Integer getMaxConnectionsNumber() { + return maxConnectionsNumber; + } + + public void setMaxConnectionsNumber(Integer value) { + maxConnectionsNumber = value; + setChanged(); + notifyObservers(REPOSITORY_MAX_CONNECTIONS_NUMBER_CHANGED); + } + + public void display() { + System.out.printf( + "RepositoryPrefGroup(expiry=%d, cachePassword=%d, maxConnectionsNumber=%d)\n", + expiry, cachePassword, maxConnectionsNumber); + } }