xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #763 Removed references to OBE cots org.apahce.tomcat.nativ to reduce size of collaboration standalone product. This project could now be removed from the baseline

Browse source 
Change-Id: I9d8d0155afa5c01f3cc027a5f5adb0e2a9893e47

Former-commit-id: 24423c6b03bffd01313a93b6c641b3d8fef35902
This commit is contained in:
Max Schenkelberg 2012-06-28 15:29:05 -05:00
parent 24a4ef99a7
commit a3014f6ec3
3 changed files with 2 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cave/com.raytheon.viz.core/META-INF/MANIFEST.MF
View file

@ -24,7 +24,6 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.viz.core;visibility:=reexport,
com.raytheon.uf.common.colormap;bundle-version="1.0.0",
com.raytheon.uf.common.serialization.comm,
org.apache.tomcat.nativ;bundle-version="1.0.0",
org.eclipse.core.expressions,
com.raytheon.uf.viz.application;bundle-version="1.0.0"
Eclipse-BuddyPolicy: ext, registered, global

3
edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
View file

@ -5,8 +5,7 @@ Bundle-SymbolicName: com.raytheon.uf.common.util
Bundle-Version: 1.12.1174.qualifier
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.apache.tomcat.nativ;bundle-version="1.0.0",
org.junit;bundle-version="1.0.0"
Require-Bundle: org.junit;bundle-version="1.0.0"
Export-Package: com.raytheon.uf.common.util,
com.raytheon.uf.common.util.cache,
com.raytheon.uf.common.util.registry

27
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/BufferUtil.java
View file

@ -25,9 +25,6 @@ import java.nio.ByteOrder;
import java.nio.IntBuffer;
import java.nio.ShortBuffer;
import org.apache.tomcat.jni.Buffer;
import org.apache.tomcat.jni.Library;
/**
* Utility for creating and managing nio Buffers
*
@ -46,18 +43,6 @@ import org.apache.tomcat.jni.Library;
public class BufferUtil {
private static boolean mallocing = false;
static {
if (mallocing) {
try {
Library.initialize("tcnative-1");
} catch (Exception e) {
e.printStackTrace();
}
}
}
public static int wordAlignedByteWidth(Rectangle datasetBounds) {
int paddedWidth = datasetBounds.width;
@ -185,20 +170,10 @@ public class BufferUtil {
public static synchronized ByteBuffer createByteBuffer(int capacity,
boolean direct) {
if (direct) {
if (mallocing) {
return Buffer.malloc(capacity);
} else {
return ByteBuffer.allocateDirect(capacity);
}
return ByteBuffer.allocateDirect(capacity);
} else {
return ByteBuffer.allocate(capacity);
}
}
public static synchronized void freeByteBuffer(ByteBuffer buf) {
if (buf.isDirect() && mallocing) {
Buffer.free(buf);
}
}
}