Revision 752

tmp/org.txm.rcp.feature/build.properties (revision 752)
3 3
               TXM.sh
4 4
root.linux.gtk.x86_64 = linux/
5 5
root.linux.gtk.x86_64.permissions.755 = jre/bin/java
6
root.win32.win32.x86_64 = win/
7 6
root.macosx.cocoa.x86_64 = mac/
8
root.folder._redist/css = ../org.txm.core/res/org/txm/css/
9
root.folder._redist/xsl = ../org.txm.core/res/org/txm/xml/xsl/
10
root.folder._redist/schema = ../org.txm.core/res/org/txm/xml/schema/
7
root.win32.win32.x86_64 = win/,../org.txm.libs.cqp.win32/res/win64/dependencies/
8
root.win32.win32.x86_64.folder._redist/css = ../org.txm.core/res/org/txm/css/
9
root.win32.win32.x86_64.folder._redist/xsl = ../org.txm.core/res/org/txm/xml/xsl/
10
root.win32.win32.x86_64.folder._redist/schema = ../org.txm.core/res/org/txm/xml/schema/
11
root.win32.win32.x86_64.folder._redist/scripts/samples/R = ../org.txm.statsengine.r.core/R/
12
root.win32.win32.x86_64.folder.samples = ../org.txm.setups/shared/all/samples/
tmp/org.txm.core/src/java/org/txm/PostTXMHOMEInstallationStep.java (revision 752)
1 1
package org.txm;
2 2

  
3
import java.io.File;
4

  
5 3
import org.txm.objects.Workspace;
6 4

  
7 5
/**
tmp/org.txm.searchengine.cqp.feature/build.properties (revision 752)
1 1
bin.includes = feature.xml
2
root.win32.win32.x86_64 = ../org.txm.libs.cqp.win32/res/win64/dependencies/
tmp/org.txm.statsengine.r.feature/build.properties (revision 752)
1 1
bin.includes = feature.xml
2
root.folder._redist/scripts/samples/R = ../org.txm.statsengine.r.core/R/
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiServer.java (revision 752)
162 162

  
163 163
		if (!isLoaded) {
164 164

  
165
			Field LIBRARIES = ClassLoader.class.getDeclaredField("loadedLibraryNames");
165
			Field LIBRARIES = ClassLoader.class.getDeclaredField("loadedLibraryNames"); //$NON-NLS-1$
166 166
			LIBRARIES.setAccessible(true);
167 167

  
168 168
			try {
169 169

  
170 170
				String cqplibpath = TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, CQPLibPreferences.PREFERENCES_NODE);
171 171
				if (cqplibpath == null || cqplibpath.length() == 0) {
172
					System.out.println("Error: cqp lib path is not set in preferences");
172
					System.err.println("Error: cqp lib path is not set in preferences");
173 173
					return false;
174 174
				}
175
				String path = System.getProperty("java.library.path");
176
				String libpath = System.getProperty("path.separator")+cqplibpath;
175
				String path = System.getProperty("java.library.path"); //$NON-NLS-1$
176
				String libpath = System.getProperty("path.separator") + cqplibpath; //$NON-NLS-1$
177 177

  
178 178
				if (!path.contains(libpath)) {
179 179
					path += libpath;
180
					//path = cqplibpath + System.getProperty("path.separator"); // test to load dependent dlls
181 180
				}
182
				System.setProperty("java.library.path", path);
181
				System.setProperty("java.library.path", path); //$NON-NLS-1$
183 182
				//System.out.println("Current java.library.path "+System.getProperty("java.library.path"));
184 183

  
185 184
				// this is a hack to force the JVM to reload java.library.path
186
				Field fieldSysPath = ClassLoader.class.getDeclaredField( "sys_paths" );
185
				Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths"); //$NON-NLS-1$
187 186
				fieldSysPath.setAccessible( true );
188 187
				fieldSysPath.set( null, null );
189

  
190 188
				
191
				// FIXME: tests to load dependency dlls from plugin directory
192
				// it works but its platform dependent
193
//				System.loadLibrary("libglib-2.0-0");
194
//				//System.loadLibrary("IEShims");
195
//				System.loadLibrary("libcharset-1");
196
//				//System.loadLibrary("libgnurx-0");
197
//				System.loadLibrary("libiconv-2");
198
//				System.loadLibrary("libintl-8");
199
//				System.loadLibrary("libpcre-1");
200
//				System.loadLibrary("pcre3");
201
				
202
				
203
				System.loadLibrary("cqpjni");
189
				System.loadLibrary("cqpjni"); //$NON-NLS-1$
204 190
				Log.info("cqpjni loaded from dirs: " + path + ".");
205 191
				isLoaded = true;
206 192

  

Also available in: Unified diff