marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sschaff...@apache.org
Subject [38/51] [abbrv] libraries/ compiling
Date Tue, 19 Feb 2013 17:04:22 GMT
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/CompoundIcon.java
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/CompoundIcon.java b/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/CompoundIcon.java
deleted file mode 100644
index 960f5cd..0000000
--- a/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/CompoundIcon.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (c) 2009-2011, EzWare
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.Redistributions
- * in binary form must reproduce the above copyright notice, this list of
- * conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.Neither the name of the
- * EzWare nor the names of its contributors may be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package org.oxbow.swingbits.util.swing;
-
-import java.awt.*;
-import javax.swing.*;
-
-/**
- * The CompoundIcon will paint two, or more, Icons as a single Icon. The Icons
- * are painted in the order in which they are added.
- * 
- * The Icons can be laid out
- * <ul>
- * <li>Horizontally
- * <li>Vertically
- * <li>Stacked
- * </ul>
- * 
- */
-public class CompoundIcon implements Icon {
-	public enum Layout {
-		HORIZONTAL, VERTICAL, STACKED;
-	}
-
-	public final static float TOP = 0.0f;
-	public final static float LEFT = 0.0f;
-	public final static float CENTER = 0.5f;
-	public final static float BOTTOM = 1.0f;
-	public final static float RIGHT = 1.0f;
-
-	private Icon[] icons;
-
-	private Layout layout;
-
-	private int gap;
-
-	private float alignmentX = CENTER;
-	private float alignmentY = CENTER;
-
-	/**
-	 * Convenience constructor for creating a CompoundIcon where the icons are
-	 * laid out horizontally, the gap is 0 and the X/Y alignments will default
-	 * to CENTER.
-	 * 
-	 * @param icons
-	 *            the Icons to be painted as part of the CompoundIcon
-	 */
-	public CompoundIcon(Icon... icons) {
-		this(Layout.HORIZONTAL, icons);
-	}
-
-	/**
-	 * Convenience constructor for creating a CompoundIcon where the gap is 0
-	 * and the X/Y alignments will default to CENTER.
-	 * 
-	 * @param layout
-	 *            the layout used to lay out the icons for painting.
-	 * @param icons
-	 *            the Icons to be painted as part of the CompoundIcon
-	 */
-	public CompoundIcon(Layout layout, Icon... icons) {
-		this(layout, 0, icons);
-	}
-
-	/**
-	 * Convenience constructor for creating a CompoundIcon where the X/Y
-	 * alignments will default to CENTER.
-	 * 
-	 * @param layout
-	 *            the layout used to lay out the icons for painting
-	 * @param gap
-	 *            the gap between the icons
-	 * @param icons
-	 *            the Icons to be painted as part of the CompoundIcon
-	 */
-	public CompoundIcon(Layout layout, int gap, Icon... icons) {
-		this(layout, gap, CENTER, CENTER, icons);
-	}
-
-	/**
-	 * Create a CompoundIcon specifying all the properties.
-	 * 
-	 * @param layout
-	 *            the layout used to lay out the icons for painting
-	 * @param gap
-	 *            the gap between the icons
-	 * @param alignmentX
-	 *            the X alignment of the icons. Common values are LEFT, CENTER,
-	 *            RIGHT. Can be any value between 0.0 and 1.0
-	 * @param alignmentY
-	 *            the Y alignment of the icons. Common values are TOP, CENTER,
-	 *            BOTTOM. Can be any value between 0.0 and 1.0
-	 * @param icons
-	 *            the Icons to be painted as part of the CompoundIcon
-	 */
-	public CompoundIcon(Layout layout, int gap, float alignmentX,
-			float alignmentY, Icon... icons) {
-		this.layout = layout;
-		this.gap = gap;
-		this.alignmentX = alignmentX > 1.0f ? 1.0f : alignmentX < 0.0f ? 0.0f
-				: alignmentX;
-		this.alignmentY = alignmentY > 1.0f ? 1.0f : alignmentY < 0.0f ? 0.0f
-				: alignmentY;
-
-		for (int i = 0; i < icons.length; i++) {
-			if (icons[i] == null) {
-				throw new IllegalArgumentException("Icon (" + i
-						+ ") cannot be null");
-			}
-		}
-
-		this.icons = icons;
-	}
-
-	/**
-	 * Get the layout along which each icon is painted.
-	 * 
-	 * @return the layout
-	 */
-	public Layout getLayout() {
-		return layout;
-	}
-
-	/**
-	 * Get the gap between each icon
-	 * 
-	 * @return the gap in pixels
-	 */
-	public int getGap() {
-		return gap;
-	}
-
-	/**
-	 * Get the alignment of the icon on the x-layout
-	 * 
-	 * @return the alignment
-	 */
-	public float getAlignmentX() {
-		return alignmentX;
-	}
-
-	/**
-	 * Get the alignment of the icon on the y-layout
-	 * 
-	 * @return the alignment
-	 */
-	public float getAlignmentY() {
-		return alignmentY;
-	}
-
-	/**
-	 * Get the number of Icons contained in this CompoundIcon.
-	 * 
-	 * @return the total number of Icons
-	 */
-	public int getIconCount() {
-		return icons.length;
-	}
-
-	/**
-	 * Get the Icon at the specified index.
-	 * 
-	 * @param index
-	 *            the index of the Icon to be returned
-	 * @return the Icon at the specified index
-	 * @exception IndexOutOfBoundsException
-	 *                if the index is out of range
-	 */
-	public Icon getIcon(int index) {
-		return icons[index];
-	}
-
-	// ///// Icon Interface /////////////////////////////
-
-	/**
-	 * Gets the width of this icon.
-	 * 
-	 * @return the width of the icon in pixels.
-	 */
-	@Override
-	public int getIconWidth() {
-		int width = 0;
-
-		// Add the width of all Icons while also including the gap
-		if (layout == Layout.HORIZONTAL) {
-			width += (icons.length - 1) * gap;
-			for (Icon icon : icons)
-				width += icon.getIconWidth();
-		} else { // Just find the maximum width
-			for (Icon icon : icons)
-				width = Math.max(width, icon.getIconWidth());
-		}
-
-		return width;
-	}
-
-	/**
-	 * Gets the height of this icon.
-	 * 
-	 * @return the height of the icon in pixels.
-	 */
-	@Override
-	public int getIconHeight() {
-		int height = 0;
-
-		// Add the height of all Icons while also including the gap
-		if (layout == Layout.VERTICAL) {
-			height += (icons.length - 1) * gap;
-
-			for (Icon icon : icons)
-				height += icon.getIconHeight();
-		} else // Just find the maximum height
-		{
-			for (Icon icon : icons)
-				height = Math.max(height, icon.getIconHeight());
-		}
-
-		return height;
-	}
-
-	/**
-	 * Paint the icons of this compound icon at the specified location
-	 * 
-	 * @param c The component on which the icon is painted 
-	 *            
-	 * @param g the graphics context
-	 *            
-	 * @param x the X coordinate of the icon's top-left corner
-	 *            
-	 * @param y the Y coordinate of the icon's top-left corner
-	 *            
-	 */
-	@Override
-	public void paintIcon(Component c, Graphics g, int x, int y) {
-		if (layout == Layout.HORIZONTAL) {
-			int height = getIconHeight();
-
-			for (Icon icon : icons) {
-				int iconY = getOffset(height, icon.getIconHeight(), alignmentY);
-				icon.paintIcon(c, g, x, y + iconY);
-				x += icon.getIconWidth() + gap;
-			}
-		} else if (layout == Layout.VERTICAL) {
-			int width = getIconWidth();
-
-			for (Icon icon : icons) {
-				int iconX = getOffset(width, icon.getIconWidth(), alignmentX);
-				icon.paintIcon(c, g, x + iconX, y);
-				y += icon.getIconHeight() + gap;
-			}
-		} else  {// must be Z_layout
-		
-			int width = getIconWidth();
-			int height = getIconHeight();
-
-			for (Icon icon : icons) {
-				int iconX = getOffset(width, icon.getIconWidth(), alignmentX);
-				int iconY = getOffset(height, icon.getIconHeight(), alignmentY);
-				icon.paintIcon(c, g, x + iconX, y + iconY);
-			}
-		}
-	}
-
-	/*
-	 * When the icon value is smaller than the maximum value of all icons the
-	 * icon needs to be aligned appropriately. Calculate the offset to be used
-	 * when painting the icon to achieve the proper alignment.
-	 */
-	private int getOffset(int maxValue, int iconValue, float alignment) {
-		float offset = (maxValue - iconValue) * alignment;
-		return Math.round(offset);
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/EmptyIcon.java
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/EmptyIcon.java b/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/EmptyIcon.java
deleted file mode 100644
index d2129f4..0000000
--- a/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/EmptyIcon.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2009-2011, EzWare
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.Redistributions
- * in binary form must reproduce the above copyright notice, this list of
- * conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.Neither the name of the
- * EzWare nor the names of its contributors may be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package org.oxbow.swingbits.util.swing;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.RenderingHints;
-import java.awt.geom.RoundRectangle2D;
-
-import javax.swing.Icon;
-
-public class EmptyIcon implements Icon {
-	
-	private final int size;
-	private boolean paintImage;
-	
-	public static final EmptyIcon visible( int size ) {
-		return new EmptyIcon(size, true);
-	}
-
-	public static final EmptyIcon hidden() {
-		return new EmptyIcon(0, false); 
-	}
-	
-	private EmptyIcon( int size, boolean paintImage ) {
-		this.size = Math.abs(size == 0? 1: size); // needs at least 1px to copy images (see Icons class)
-		this.paintImage = paintImage;
-	}
-	
-	@Override
-	public int getIconHeight() {
-		return size;
-	}
-
-	@Override
-	public int getIconWidth() {
-		return size;
-	}
-
-	@Override
-	public void paintIcon(Component c, Graphics g, int x, int y) {
-
-		if ( paintImage && size > 2 ) {
-		
-			 Graphics2D g2 = (Graphics2D)g;
-			 g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-
-			 int radius = size / 3;
-			 RoundRectangle2D r = new RoundRectangle2D.Float(x, y, size-1, size-1, radius, radius );
-			 
-			 g2.setColor( new Color( 255, 255, 0, 127) );
-			 g2.fill(r);
-			 
-			 g2.setStroke( new BasicStroke(3));
-			 g2.setColor(Color.RED);
-			 g2.draw(r);
-			 
-			 Point center = new Point( x+size/2, y+size/2 );
-			 
-			 int d = size / 4;
-			 int xad = center.x-d;
-			 int xsd = center.x+d;
-			 int yad = center.y+d;
-			 int ysd = center.y-d;
-			 g2.drawLine( xad, ysd, xsd, yad );
-			 g2.drawLine( xad, yad, xsd, ysd );
-		
-		}
-
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/Icons.java
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/Icons.java b/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/Icons.java
deleted file mode 100644
index 9a320c0..0000000
--- a/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/Icons.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2009-2011, EzWare
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.Redistributions
- * in binary form must reproduce the above copyright notice, this list of
- * conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.Neither the name of the
- * EzWare nor the names of its contributors may be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package org.oxbow.swingbits.util.swing;
-
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-
-/**
- * Utility class for icon manipulation
- *
- * Created on Mar 1, 2010
- * @author Eugene Ryzhikov
- *
- */
-public final class Icons  {
-
-	private Icons() {}
-
-	/**
-	 * Converts any icon to image
-	 * @param icon icon to convert
-	 * @return resulted image
-	 */
-	public static final Image asImage( Icon icon ) {
-
-		if ( icon == null ) throw new IllegalArgumentException("The icon should not be null");
-
-		if ( icon instanceof ImageIcon ) return ((ImageIcon)icon).getImage();
-		
-		int w = icon.getIconWidth() == 0? 1: icon.getIconWidth();
-		int h = icon.getIconHeight() == 0? 1: icon.getIconHeight();
-
-		Image image = new BufferedImage( w, h, BufferedImage.TYPE_INT_ARGB);
-		icon.paintIcon( null, image.getGraphics(), 0, 0 );
-		return image;
-
-	}
-
-
-	/**
-	 * Converts any icon to an image with specified width and height
-	 * @param icon icon to convert
-	 * @param newWidth new image width
-	 * @param newHeight new image height
-	 * @return resulted image
-	 */
-	public static final Image asImage( Icon icon, int newWidth,  int newHeight ) {
-
-		return asImage( icon ).getScaledInstance( newWidth, newHeight, Image.SCALE_SMOOTH );
-	}
-
-	/**
-	 * Scales any icon to specified width and height
-	 * @param icon icon to scale
-	 * @param newWidth new icon width
-	 * @param newHeight new icon height
-	 * @return resulting icon
-	 */
-	public static final Icon scale( Icon icon, int newWidth, int newHeight ) {
-
-		return new ImageIcon( asImage( icon, newWidth, newHeight ));
-
-	}
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/SwingBean.java
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/SwingBean.java b/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/SwingBean.java
deleted file mode 100644
index fb84485..0000000
--- a/launchers/lmf-splash/src/main/java/org/oxbow/swingbits/util/swing/SwingBean.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2009-2011, EzWare
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.Redistributions
- * in binary form must reproduce the above copyright notice, this list of
- * conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.Neither the name of the
- * EzWare nor the names of its contributors may be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-package org.oxbow.swingbits.util.swing;
-
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-
-/**
- * Base for all beans not inherited from JComponent
- *
- * Created on Mar 1, 2010
- * * @author Eugene Ryzhikov
- *
- */
-public class SwingBean {
-
-	private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
-
-
-	public void addPropertyListener( PropertyChangeListener pl ) {
-		propertyChangeSupport.addPropertyChangeListener(pl);
-	}
-
-	public void addPropertyListener( String propertyName, PropertyChangeListener pl ) {
-		propertyChangeSupport.addPropertyChangeListener( propertyName, pl );
-	}
-
-	public void removePropertyListener( PropertyChangeListener pl ) {
-		propertyChangeSupport.removePropertyChangeListener(pl);
-	}
-
-	public void removePropertyListener( String propertyName, PropertyChangeListener pl ) {
-		propertyChangeSupport.removePropertyChangeListener( propertyName, pl );
-	}
-	
-	
-	protected abstract class Property<T> extends BeanProperty<T> {
-		public Property( String propertyName, boolean forceChange ) {
-			super( propertyChangeSupport, propertyName, forceChange );
-		}
-		
-		public Property( String propertyName ) {
-			super( propertyChangeSupport, propertyName );
-		}
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/at/newmedialab/lmf/systray/lmf1.png
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/at/newmedialab/lmf/systray/lmf1.png b/launchers/lmf-splash/src/main/resources/at/newmedialab/lmf/systray/lmf1.png
deleted file mode 100644
index 4e2c56d..0000000
Binary files a/launchers/lmf-splash/src/main/resources/at/newmedialab/lmf/systray/lmf1.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/arrowGreenRight.png
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/arrowGreenRight.png b/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/arrowGreenRight.png
deleted file mode 100644
index 63b675c..0000000
Binary files a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/arrowGreenRight.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/fewerDetails.png
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/fewerDetails.png b/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/fewerDetails.png
deleted file mode 100644
index c45d4ac..0000000
Binary files a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/fewerDetails.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/fewerDetailsMac.png
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/fewerDetailsMac.png b/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/fewerDetailsMac.png
deleted file mode 100644
index 5f7ec01..0000000
Binary files a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/fewerDetailsMac.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_error.png
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_error.png b/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_error.png
deleted file mode 100644
index 0344822..0000000
Binary files a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_error.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_info.png
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_info.png b/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_info.png
deleted file mode 100644
index d8197d6..0000000
Binary files a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_info.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_question.png
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_question.png b/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_question.png
deleted file mode 100644
index d56ba2c..0000000
Binary files a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_question.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_warning.png
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_warning.png b/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_warning.png
deleted file mode 100644
index 284e5e3..0000000
Binary files a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/linux_warning.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/moreDetails.png
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/moreDetails.png b/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/moreDetails.png
deleted file mode 100644
index b8896c7..0000000
Binary files a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/moreDetails.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/moreDetailsMac.png
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/moreDetailsMac.png b/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/moreDetailsMac.png
deleted file mode 100644
index a64f040..0000000
Binary files a/launchers/lmf-splash/src/main/resources/org/oxbow/swingbits/dialog/task/moreDetailsMac.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/task-dialog.properties
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/task-dialog.properties b/launchers/lmf-splash/src/main/resources/task-dialog.properties
deleted file mode 100644
index 1517a51..0000000
--- a/launchers/lmf-splash/src/main/resources/task-dialog.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (C) 2013 Salzburg Research.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-Ok=OK
-Cancel=Cancel
-Close=Close
-Yes=Yes
-No=No
-MoreDetails=More Details
-FewerDetails=Fewer Details
-Details=Details
-Information=Information
-Error=Error
-Question=Question
-Warning=Warning
-Exception=Exception
-Choice=Choice
-Select=Select
-Input=Input
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/task-dialog_de_DE.properties
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/task-dialog_de_DE.properties b/launchers/lmf-splash/src/main/resources/task-dialog_de_DE.properties
deleted file mode 100644
index 6895e63..0000000
--- a/launchers/lmf-splash/src/main/resources/task-dialog_de_DE.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-OK=OK
-Cancel=Abbrechen
-Close=Schlie�en
-Yes=Ja
-No=Nein
-MoreDetails=Weitere Details
-FewerDetails=Weniger Details
-Details=Details
-Information=Information
-Error=Fehler
-Question=Frage
-Warning=Warnung
-Exception=Ausnahme
-Choice=Auswahl
-Select=Ausw�hlen
-Input=Eingabe
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/task-dialog_es_ES.properties
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/task-dialog_es_ES.properties b/launchers/lmf-splash/src/main/resources/task-dialog_es_ES.properties
deleted file mode 100644
index bc959a8..0000000
--- a/launchers/lmf-splash/src/main/resources/task-dialog_es_ES.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-Ok=OK
-Cancel=Cancelar
-Close=Cerrar
-Yes=S�
-No=No
-MoreDetails=M�s detalles
-FewerDetails=Pocos detalles
-Details=Detalles
-Information=Informaci�n
-Error=Error
-Question=Pregunta
-Warning=Advertencia
-Exception=Excepci�n
-Choice=Elecci�n
-Select=Seleccione
-Input=Input
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/task-dialog_fr_FR.properties
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/task-dialog_fr_FR.properties b/launchers/lmf-splash/src/main/resources/task-dialog_fr_FR.properties
deleted file mode 100644
index 533d8e3..0000000
--- a/launchers/lmf-splash/src/main/resources/task-dialog_fr_FR.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-OK=OK
-Cancel=Annuler
-Close=Fermer
-Yes=Oui
-No=Non
-MoreDetails=Plus de d�tails
-FewerDetails=Moins de d�tails
-Details=D�tails
-Information=Information
-Error=Erreur
-Question=Question
-Warning=Avertissement
-Exception=Exception
-Choice=Choix
-Select=S�lection
-Input=Entr�e

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/task-dialog_it_IT.properties
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/task-dialog_it_IT.properties b/launchers/lmf-splash/src/main/resources/task-dialog_it_IT.properties
deleted file mode 100644
index da76b2a..0000000
--- a/launchers/lmf-splash/src/main/resources/task-dialog_it_IT.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-OK=OK
-Cancel=Annulla
-Close=Chiudi
-Yes=Si
-No=No
-MoreDetails=Pi\u00F9 Dettagli
-FewerDetails=Meno Dettagli
-Details=Dettagli
-Information=Informazione
-Error=Errore
-Question=Domanda
-Warning=Avvertenza
-Exception=Eccezione
-Choice=Scelta
-Select=Seleziona
-Input=Input
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/task-dialog_pl_PL.properties
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/task-dialog_pl_PL.properties b/launchers/lmf-splash/src/main/resources/task-dialog_pl_PL.properties
deleted file mode 100644
index caf1e01..0000000
--- a/launchers/lmf-splash/src/main/resources/task-dialog_pl_PL.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-Ok=OK
-Cancel=Anuluj
-Close=Zamknij
-Yes=Tak
-No=Nie
-MoreDetails=Więcej szczegółów
-FewerDetails=Mniej szczegółów
-Details=Szczegóły
-Information=Informacja
-Error=Błąd
-Question=Pytanie
-Warning=Ostrzeżenie
-Exception=Wyjątek
-Choice=Wybór
-Select=Wybór
-Input=Wprowadzanie

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/task-dialog_pt_BR.properties
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/task-dialog_pt_BR.properties b/launchers/lmf-splash/src/main/resources/task-dialog_pt_BR.properties
deleted file mode 100644
index 8f01245..0000000
--- a/launchers/lmf-splash/src/main/resources/task-dialog_pt_BR.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-Ok=OK
-Cancel=Cancelar
-Close=Fechar
-Yes=Sim
-No=N�o
-MoreDetails=Mais Detalhes
-FewerDetails=Menos Detalhes
-Details=Detalhes
-Information=Informa��o
-Error=Erro
-Question=Pergunta
-Warning=Advert�ncia
-Exception=Exce��o
-Choice=Op��o
-Select=Sele��o
-Input=Entrada

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/task-dialog_pt_PT.properties
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/task-dialog_pt_PT.properties b/launchers/lmf-splash/src/main/resources/task-dialog_pt_PT.properties
deleted file mode 100644
index 8f01245..0000000
--- a/launchers/lmf-splash/src/main/resources/task-dialog_pt_PT.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-Ok=OK
-Cancel=Cancelar
-Close=Fechar
-Yes=Sim
-No=N�o
-MoreDetails=Mais Detalhes
-FewerDetails=Menos Detalhes
-Details=Detalhes
-Information=Informa��o
-Error=Erro
-Question=Pergunta
-Warning=Advert�ncia
-Exception=Exce��o
-Choice=Op��o
-Select=Sele��o
-Input=Entrada

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-splash/src/main/resources/task-dialog_zh_CN.properties
----------------------------------------------------------------------
diff --git a/launchers/lmf-splash/src/main/resources/task-dialog_zh_CN.properties b/launchers/lmf-splash/src/main/resources/task-dialog_zh_CN.properties
deleted file mode 100644
index e29985e..0000000
--- a/launchers/lmf-splash/src/main/resources/task-dialog_zh_CN.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-Ok=\u786e\u5b9a
-Cancel=\u653e\u5f03
-Close=\u5173\u95ed
-Yes=\u662f
-No=\u5426
-MoreDetails=\u8be6\u7ec6\u4fe1\u606f
-FewerDetails=\u7b80\u660e\u4fe1\u606f
-Details=\u4fe1\u606f
-Information=\u4fe1\u606f
-Error=\u9519\u8bef
-Question=\u95ee\u9898
-Warning=\u8b66\u544a
-Exception=\u5f02\u5e38
-Choice=\u9009\u9879
-Select=\u9009\u62e9
-Input=\u8f93\u5165

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/lmf-webapp/pom.xml b/launchers/lmf-webapp/pom.xml
deleted file mode 100644
index 65f860a..0000000
--- a/launchers/lmf-webapp/pom.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2013 The Apache Software Foundation
-  ~
-  ~  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~  You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.marmotta</groupId>
-        <artifactId>lmf-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>lmf-webapp</artifactId>
-    <packaging>war</packaging>
-
-    <name>LMF Web Application</name>
-    <description>Web Application bundle (WAR file) containing the complete Linked Media Framework</description>
-
-    <properties>
-        <!-- these are used for the goals tomcat6/7:run or jetty:run -->
-        <lmf.home>/tmp/lmf</lmf.home>
-        <lmf.context>/</lmf.context>
-        <lmf.port>8080</lmf.port>
-    </properties>
-
-    <build>
-        <finalName>LMF</finalName>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.3</version>
-                    <configuration>
-                        <archive>
-                            <manifest>
-                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                            </manifest>
-                        </archive>
-                        <archiveClasses>false</archiveClasses>
-                    </configuration>
-                </plugin>
-                <plugin> <!-- generate JRebel Configuration -->
-                    <groupId>org.zeroturnaround</groupId>
-                    <artifactId>jrebel-maven-plugin</artifactId>
-                    <configuration>
-                        <relativePath>../</relativePath>
-                        <rootPath>${rebel.root}</rootPath>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.7</version>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.tomcat.maven</groupId>
-                    <artifactId>tomcat6-maven-plugin</artifactId>
-                    <version>2.0</version>
-                    <configuration>
-                        <path>${lmf.context}</path>
-                        <port>${lmf.port}</port>
-                        <systemProperties>
-                            <kiwi.home>${lmf.home}</kiwi.home>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.tomcat.maven</groupId>
-                    <artifactId>tomcat7-maven-plugin</artifactId>
-                    <version>2.0</version>
-                    <configuration>
-                        <path>${lmf.context}</path>
-                        <port>${lmf.port}</port>
-                        <systemProperties>
-                            <kiwi.home>${lmf.home}</kiwi.home>
-                        </systemProperties>
-<!--                         <contextReloadable>true</contextReloadable> -->
-<!--                         <backgroundProcessorDelay>10</backgroundProcessorDelay> -->
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>maven-jetty-plugin</artifactId>
-                    <version>6.1.10</version>
-                    <configuration>
-                        <contextPath>${lmf.context}</contextPath>
-                        <connectors>
-                            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                                <port>${lmf.port}</port>
-                            </connector>
-                        </connectors>
-                        <systemProperties>
-                            <systemProperty>
-                                <name>kiwi.home</name>
-                                <value>${lmf.home}</value>
-                            </systemProperty>
-                        </systemProperties>
-                        <stopKey>foo</stopKey>
-                        <stopPort>9999</stopPort>
-                    </configuration>
-                </plugin>              
-            </plugins>
-        </pluginManagement>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat6-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat7-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>                       
-            </plugin>             
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>cleanall</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-clean-plugin</artifactId>
-                        <version>2.5</version>
-                        <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>${lmf.home}</directory>
-                                    <followSymlinks>true</followSymlinks>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <!-- LMF Modules, include the ones needed by the application -->
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>lmf-core</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>lmf-ldpath</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>lmf-ldcache</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>lmf-reasoner</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>lmf-sparql</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>lmf-security</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>lmf-versioning</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <!--
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>lmf-templating</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>lmf-user</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
-        <!-- Servlet / CDI Environment -->
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>el-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.weld.servlet</groupId>
-            <artifactId>weld-servlet-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-webapp/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/launchers/lmf-webapp/src/main/resources/META-INF/beans.xml b/launchers/lmf-webapp/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index 6f919f1..0000000
--- a/launchers/lmf-webapp/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2013 Salzburg Research.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<beans
-   xmlns="http://java.sun.com/xml/ns/javaee"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="
-      http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-
-</beans>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-webapp/src/main/resources/ehcache-lmf.xml
----------------------------------------------------------------------
diff --git a/launchers/lmf-webapp/src/main/resources/ehcache-lmf.xml b/launchers/lmf-webapp/src/main/resources/ehcache-lmf.xml
deleted file mode 100644
index 42e0ca7..0000000
--- a/launchers/lmf-webapp/src/main/resources/ehcache-lmf.xml
+++ /dev/null
@@ -1,420 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2013 Salzburg Research.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<!--
-CacheManager Configuration
-==========================
-An ehcache-lmf.xml corresponds to a single CacheManager.
-
-See instructions below or the ehcache schema (ehcache.xsd) on how to configure.
-
-System property tokens can be specified in this file which are replaced when the configuration
-is loaded. For example multicastGroupPort=${multicastGroupPort} can be replaced with the
-System property either from an environment variable or a system property specified with a
-command line switch such as -DmulticastGroupPort=4446.
-
-The attributes of <ehcache> are:
-* name - an optional name for the CacheManager.  The name is optional and primarily used 
-for documentation or to distinguish Terracotta clustered cache state.  With Terracotta 
-clustered caches, a combination of CacheManager name and cache name uniquely identify a 
-particular cache store in the Terracotta clustered memory.
-* updateCheck - an optional boolean flag specifying whether this CacheManager should check
-for new versions of Ehcache over the Internet.  If not specified, updateCheck="true".
-* monitoring - an optional setting that determines whether the CacheManager should 
-automatically register the SampledCacheMBean with the system MBean server.  Currently,
-this monitoring is only useful when using Terracotta and thus the "autodetect" value 
-will detect the presence of Terracotta and register the MBean.  Other allowed values 
-are "on" and "off".  The default is "autodetect".
--->    
-<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd"
-         updateCheck="false"
-         name="lmf">
-
-    <!-- 
-    DiskStore configuration
-    =======================
-
-    The diskStore element is optional. To turn off disk store path creation, comment out the diskStore
-    element below.
-
-    Configure it if you have overflowToDisk or diskPersistent enabled for any cache.
-
-    If it is not configured, and a cache is created which requires a disk store, a warning will be
-     issued and java.io.tmpdir will automatically be used.
-
-    diskStore has only one attribute - "path". It is the path to the directory where
-    .data and .index files will be created.
-
-    If the path is one of the following Java System Property it is replaced by its value in the
-    running VM. For backward compatibility these are not specified without being enclosed in the ${token}
-    replacement syntax.
-
-    The following properties are translated:
-    * user.home - KiWiUser's home directory
-    * user.dir - KiWiUser's current working directory
-    * java.io.tmpdir - Default temp file path
-    * ehcache.disk.store.dir - A system property you would normally specify on the command line
-      e.g. java -Dehcache.disk.store.dir=/u01/myapp/diskdir ...
-
-    Subdirectories can be specified below the property e.g. java.io.tmpdir/one
-
-    -->
-    <diskStore path="java.io.tmpdir/lmf-cache/lmf"/>
-
-   <!--
-    Cachemanagereventlistener
-    =========================
-    Specifies a CacheManagerEventListenerFactory which is notified when Caches are added
-    or removed from the CacheManager.
-
-    The attributes of CacheManagerEventListenerFactory are:
-    * class - a fully qualified factory class name
-    * properties - comma separated properties having meaning only to the factory.
-
-    Sets the fully qualified class name to be registered as the CacheManager event listener.
-
-    The events include:
-    * adding a Cache
-    * removing a Cache
-
-    Callbacks to listener methods are synchronous and unsynchronized. It is the responsibility
-    of the implementer to safely handle the potential performance and thread safety issues
-    depending on what their listener is doing.
-
-    If no class is specified, no listener is created. There is no default.
-    -->
-    <cacheManagerEventListenerFactory class="" properties=""/>
-
-
-    <!--
-    CacheManagerPeerProvider
-    ========================
-    (For distributed operation)
-
-    Specifies a CacheManagerPeerProviderFactory which will be used to create a
-    CacheManagerPeerProvider, which discovers other CacheManagers in the cluster.
-
-    One or more providers can be configured. The first one in the ehcache-lmf.xml is the default, which is used
-    for replication and bootstrapping.
-
-    The attributes of cacheManagerPeerProviderFactory are:
-    * class - a fully qualified factory class name
-    * properties - comma separated properties having meaning only to the factory.
-
-    Providers are available for RMI, JGroups and JMS as shown following.
-
-    RMICacheManagerPeerProvider
-    +++++++++++++++++++++++++++
-
-    Ehcache comes with a built-in RMI-based distribution system with two means of discovery of
-    CacheManager peers participating in the cluster:
-    * automatic, using a multicast group. This one automatically discovers peers and detects
-      changes such as peers entering and leaving the group
-    * manual, using manual rmiURL configuration. A hardcoded list of peers is provided at
-      configuration time.
-
-    Configuring Automatic Discovery:
-    Automatic discovery is configured as per the following example:
-    <cacheManagerPeerProviderFactory
-                        class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-                        properties="hostName=fully_qualified_hostname_or_ip,
-                                    peerDiscovery=automatic, multicastGroupAddress=230.0.0.1,
-                                    multicastGroupPort=4446, timeToLive=32"/>
-
-    Valid properties are:
-    * peerDiscovery (mandatory) - specify "automatic"
-    * multicastGroupAddress (mandatory) - specify a valid multicast group address
-    * multicastGroupPort (mandatory) - specify a dedicated port for the multicast heartbeat
-      traffic
-    * timeToLive - specify a value between 0 and 255 which determines how far the packets will
-      propagate.
-
-      By convention, the restrictions are:
-      0   - the same host
-      1   - the same subnet
-      32  - the same site
-      64  - the same region
-      128 - the same continent
-      255 - unrestricted
-
-     * hostName - the hostname or IP of the interface to be used for sending and receiving multicast packets
-       (relevant to mulithomed hosts only)
-
-    Configuring Manual Discovery:
-    Manual discovery requires a unique configuration per host. It is contains a list of rmiURLs for the peers, other
-    than itself. So, if we have server1, server2 and server3 the configuration will be:
-
-    In server1's configuration:
-    <cacheManagerPeerProviderFactory class=
-                          "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-                          properties="peerDiscovery=manual,
-                          rmiUrls=//server2:40000/sampleCache1|//server3:40000/sampleCache1
-                          | //server2:40000/sampleCache2|//server3:40000/sampleCache2"
-                          propertySeparator="," />
-
-    In server2's configuration:
-    <cacheManagerPeerProviderFactory class=
-                          "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-                          properties="peerDiscovery=manual,
-                          rmiUrls=//server1:40000/sampleCache1|//server3:40000/sampleCache1
-                          | //server1:40000/sampleCache2|//server3:40000/sampleCache2"
-                          propertySeparator="," />
-
-    In server3's configuration:
-    <cacheManagerPeerProviderFactory class=
-                          "net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"
-                          properties="peerDiscovery=manual,
-                          rmiUrls=//server1:40000/sampleCache1|//server2:40000/sampleCache1
-                          | //server1:40000/sampleCache2|//server2:40000/sampleCache2"
-                          propertySeparator="," />
-
-
-    Valid properties are:
-    * peerDiscovery (mandatory) - specify "manual"
-    * rmiUrls (mandatory) - specify a pipe separated list of rmiUrls, in the form
-                            //hostname:port
-    * hostname (optional) - the hostname is the hostname of the remote CacheManager peer. The port is the listening
-      port of the RMICacheManagerPeerListener of the remote CacheManager peer.
-    
-    JGroupsCacheManagerPeerProvider
-    +++++++++++++++++++++++++++++++
-    <cacheManagerPeerProviderFactory class="net.sf.ehcache.distribution.jgroups.JGroupsCacheManagerPeerProviderFactory"
-                                     properties="connect=UDP(mcast_addr=231.12.21.132;mcast_port=45566;ip_ttl=32;
-                                     mcast_send_buf_size=150000;mcast_recv_buf_size=80000):
-                                     PING(timeout=2000;num_initial_members=6):
-                                     MERGE2(min_interval=5000;max_interval=10000):
-                                     FD_SOCK:VERIFY_SUSPECT(timeout=1500):
-                                     pbcast.NAKACK(gc_lag=10;retransmit_timeout=3000):
-                                     UNICAST(timeout=5000):
-                                     pbcast.STABLE(desired_avg_gossip=20000):
-                                     FRAG:
-                                     pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=false)"
-                                     propertySeparator="::"
-            />
-     The only property necessary is the connect String used by jgroups to configure itself. Refer to the Jgroups documentation for explanation
-     of all the protocols. The example above uses UDP multicast. If the connect property is not specified the default JGroups connection will be
-     used.       
-
-
-    JMSCacheManagerPeerProviderFactory
-    ++++++++++++++++++++++++++++++++++
-    <cacheManagerPeerProviderFactory
-            class="net.sf.ehcache.distribution.jms.JMSCacheManagerPeerProviderFactory"
-            properties="..."
-            propertySeparator=","
-            />
-
-    The JMS PeerProviderFactory uses JNDI to maintain message queue independence. Refer to the manual for full configuration
-    examples using ActiveMQ and Open Message Queue.
-
-    Valid properties are:
-    * initialContextFactoryName (mandatory) - the name of the factory used to create the message queue initial context.
-    * providerURL (mandatory) - the JNDI configuration information for the service provider to use.
-    * topicConnectionFactoryBindingName (mandatory) - the JNDI binding name for the TopicConnectionFactory
-    * topicBindingName (mandatory) - the JNDI binding name for the topic name
-    * getQueueBindingName (mandatory only if using jmsCacheLoader) - the JNDI binding name for the queue name
-    * securityPrincipalName - the JNDI java.naming.security.principal
-    * securityCredentials - the JNDI java.naming.security.credentials
-    * urlPkgPrefixes - the JNDI java.naming.factory.url.pkgs
-    * userName - the user name to use when creating the TopicConnection to the Message Queue
-    * password - the password to use when creating the TopicConnection to the Message Queue
-    * acknowledgementMode - the JMS Acknowledgement mode for both publisher and subscriber. The available choices are
-                            AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE and SESSION_TRANSACTED. The default is AUTO_ACKNOWLEDGE.
-    -->
-<!--    <cacheManagerPeerProviderFactory-->
-<!--            class="net.sf.ehcache.distribution.RMICacheManagerPeerProviderFactory"-->
-<!--            properties="peerDiscovery=automatic,-->
-<!--                        multicastGroupAddress=230.0.0.1,-->
-<!--                        multicastGroupPort=4446, timeToLive=1"-->
-<!--            propertySeparator=","-->
-<!--            />-->
-
-
-    <!--
-    CacheManagerPeerListener
-    ========================
-    (Enable for distributed operation)
-
-    Specifies a CacheManagerPeerListenerFactory which will be used to create a
-    CacheManagerPeerListener, which listens for messages from cache replicators participating in the cluster.
-
-    The attributes of cacheManagerPeerListenerFactory are:
-    class - a fully qualified factory class name
-    properties - comma separated properties having meaning only to the factory.
-
-    Ehcache comes with a built-in RMI-based distribution system. The listener component is
-    RMICacheManagerPeerListener which is configured using
-    RMICacheManagerPeerListenerFactory. It is configured as per the following example:
-
-    <cacheManagerPeerListenerFactory
-        class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
-        properties="hostName=fully_qualified_hostname_or_ip,
-                    port=40001,
-                    remoteObjectPort=40002,
-                    socketTimeoutMillis=120000"
-                    propertySeparator="," />
-
-    All properties are optional. They are:
-    * hostName - the hostName of the host the listener is running on. Specify
-      where the host is multihomed and you want to control the interface over which cluster
-      messages are received. Defaults to the host name of the default interface if not
-      specified.
-    * port - the port the RMI Registry listener listens on. This defaults to a free port if not specified.
-    * remoteObjectPort - the port number on which the remote objects bound in the registry receive calls.
-                         This defaults to a free port if not specified.
-    * socketTimeoutMillis - the number of ms client sockets will stay open when sending
-      messages to the listener. This should be long enough for the slowest message.
-      If not specified it defaults to 120000ms.
-
-    -->
-<!--    <cacheManagerPeerListenerFactory-->
-<!--            class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"/>-->
-
-    <!-- Cache configuration.
-
-    The following attributes are required.
-
-    name:
-    Sets the name of the cache. This is used to identify the cache. It must be unique.
-
-    maxElementsInMemory:
-    Sets the maximum number of objects that will be created in memory
-
-        maxElementsOnDisk:
-    Sets the maximum number of objects that will be maintained in the DiskStore
-        The default value is zero, meaning unlimited.
-
-    eternal:
-    Sets whether elements are eternal. If eternal,  timeouts are ignored and the
-    element is never expired.
-
-    overflowToDisk:
-    Sets whether elements can overflow to disk when the memory store
-    has reached the maxInMemory limit.
-
-    The following attributes are optional.
-
-    timeToIdleSeconds:
-    Sets the time to idle for an element before it expires.
-    i.e. The maximum amount of time between accesses before an element expires
-    Is only used if the element is not eternal.
-    Optional attribute. A value of 0 means that an Element can idle for infinity.
-    The default value is 0.
-
-    timeToLiveSeconds:
-    Sets the time to live for an element before it expires.
-    i.e. The maximum time between creation time and when an element expires.
-    Is only used if the element is not eternal.
-    Optional attribute. A value of 0 means that and Element can live for infinity.
-    The default value is 0.
-
-    diskPersistent:
-    Whether the disk store persists between restarts of the Virtual Machine.
-    The default value is false.
-
-    diskExpiryThreadIntervalSeconds:
-    The number of seconds between runs of the disk expiry thread. The default value
-    is 120 seconds.
-
-    memoryStoreEvictionPolicy:
-    Policy would be enforced upon reaching the maxElementsInMemory limit. Default
-    policy is Least Recently Used (specified as LRU). Other policies available -
-    First In First Out (specified as FIFO) and Less Frequently Used
-    (specified as LFU)
-
-    -->
-
-    <!--
-    Mandatory Default Cache configuration. These settings will be applied to caches
-    created programmtically using CacheManager.add(String cacheName)
-    -->
-    <defaultCache
-            maxElementsInMemory="20000"
-            overflowToDisk="false"
-            memoryStoreEvictionPolicy="LRU"
-            />
-
-
-    <!-- the cache used for triple queries by KiWi -->
-    <cache name="uri-node-cache"
-           statistics="true"
-           maxElementsInMemory="100000"
-           timeToIdleSeconds="3600"
-           overflowToDisk="false"/>
-    <cache name="anon-node-cache"
-           statistics="true"
-           maxElementsInMemory="10000"
-           timeToIdleSeconds="3600"
-           overflowToDisk="false"/>
-    <cache name="literal-cache"
-           statistics="true"
-           maxElementsInMemory="10000"
-           timeToIdleSeconds="3600"
-           overflowToDisk="false"/>
-
-    <cache name="namespace-prefix-cache"
-           statistics="true"
-           maxElementsInMemory="100"
-           overflowToDisk="true"/>
-
-    <cache name="namespace-uri-cache"
-           statistics="true"
-           maxElementsInMemory="100"
-           overflowToDisk="true"/>
-
-    <!-- the cache used for triple queries by KiWi -->
-    <cache name="query-cache"
-           statistics="true"
-           maxElementsInMemory="200000"
-           timeToIdleSeconds="3600"
-           overflowToDisk="false"/>
-
-    <!-- the cache used for resource lookups from module jar files -->
-    <cache name="resource-cache"
-           statistics="true"
-           maxElementsInMemory="10000"
-           timeToIdleSeconds="3600"
-           timeToLiveSeconds="3600"
-           overflowToDisk="false"
-           memoryStoreEvictionPolicy="LRU"/>
-
-    <!-- the cache used for triple queries by KiWi -->
-    <cache name="page-cache"
-           statistics="true"
-           maxElementsInMemory="500"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LRU"
-           overflowToDisk="true"/>
-
-    <cache name="http-content-cache"
-           statistics="true"
-           maxElementsInMemory="500"
-           timeToIdleSeconds="3600"
-           memoryStoreEvictionPolicy="LRU"
-           overflowToDisk="true"/>
-
-
-    <!--  uncomment to enable cache debugging -->
-<!-- 
-	<cacheManagerPeerListenerFactory
-	    class="org.terracotta.ehcachedx.monitor.probe.ProbePeerListenerFactory"
-	    properties="monitorAddress=localhost, monitorPort=9889" />
--->
-
-</ehcache>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-webapp/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/launchers/lmf-webapp/src/main/resources/logback.xml b/launchers/lmf-webapp/src/main/resources/logback.xml
deleted file mode 100644
index f50bd49..0000000
--- a/launchers/lmf-webapp/src/main/resources/logback.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-
-    Copyright (C) 2013 Salzburg Research.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-     ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-        <encoder>
-<!--            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>  -->
-            <pattern>%d{HH:mm:ss.SSS} %-5level - %msg%n</pattern>
-<!--            <pattern>%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</pattern> -->
-        </encoder>
-    </appender>
-
-    <logger name="kiwi.core" level="INFO" />
-
-    <logger name="kiwi.reasoner" level="INFO" />
-
-	<logger name="at.newmedialab.sn" level="TRACE" />
-    
-    <logger name="kiwi.social" level="TRACE" />
-
-    <logger name="org.hibernate" level="WARN" />
-    <!--
-    <logger name="org.hibernate.SQL" level="DEBUG" />
-    <logger name="org.hibernate.pretty" level="DEBUG" />
-    -->
-
-    <logger name="org.apache.solr" level="WARN" />
-
-    <logger name="org.quartz" level="WARN" />
-
-    <root level="info">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-webapp/src/main/webapp/META-INF/jetty-web.xml
----------------------------------------------------------------------
diff --git a/launchers/lmf-webapp/src/main/webapp/META-INF/jetty-web.xml b/launchers/lmf-webapp/src/main/webapp/META-INF/jetty-web.xml
deleted file mode 100644
index 5c4284e..0000000
--- a/launchers/lmf-webapp/src/main/webapp/META-INF/jetty-web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2013 Salzburg Research.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
-   <Call class="org.jboss.weld.environment.jetty.WeldServletHandler" name="process">
-      <Arg><Ref id="webAppCtx"/></Arg>
-   </Call>
-</Configure>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-webapp/src/main/webapp/WEB-INF/jetty-web.xml
----------------------------------------------------------------------
diff --git a/launchers/lmf-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/launchers/lmf-webapp/src/main/webapp/WEB-INF/jetty-web.xml
deleted file mode 100644
index 62feb89..0000000
--- a/launchers/lmf-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-
-    Copyright (C) 2013 Salzburg Research.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
-   "http://jetty.mortbay.org/configure.dtd">
-
-<Configure id="webAppCtx" class="org.mortbay.jetty.webapp.WebAppContext">
-
-    <Array id="annotationConfig" type="java.lang.String">
-      <Item>org.mortbay.jetty.webapp.WebInfConfiguration</Item>
-      <Item>org.mortbay.jetty.plus.webapp.EnvConfiguration</Item>
-      <Item>org.mortbay.jetty.annotations.Configuration</Item> <!-- Enables annotation support -->
-      <Item>org.mortbay.jetty.webapp.JettyWebXmlConfiguration</Item>
-      <Item>org.mortbay.jetty.webapp.TagLibConfiguration</Item>
-    </Array>
-
-   <Call class="org.jboss.weld.environment.jetty.MortbayWeldServletHandler" name="process">
-      <Arg><Ref id="webAppCtx"/></Arg>
-   </Call>
-</Configure>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/launchers/lmf-webapp/src/main/webapp/WEB-INF/web.xml b/launchers/lmf-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 8859823..0000000
--- a/launchers/lmf-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2013 Salzburg Research.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<web-app version="2.5"
-         xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
-
-    <!-- enable LMF custom JNDI implementation -->
-    <listener>
-        <listener-class>kiwi.core.jndi.LMFJndiListener</listener-class>
-    </listener>
-
-
-    <!-- enable CDI / Weld for dependency injection -->
-    <listener>
-       <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
-    </listener>
-
-
-    <!-- Initialise the KiWi system -->
-    <listener>
-        <listener-class>kiwi.core.servlet.KiWiPreStartupListener</listener-class>
-    </listener>
-
-
-    <!-- RESTeasy Webservices -->
-    <listener>
-      <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
-    </listener>
-
-    <!--
-        specifies the LMF home directory; overridden by environment variable LMF_HOME or system property kiwi.home
-    -->
-    <context-param>
-        <param-name>kiwi.home</param-name>
-        <param-value>/tmp/lmf</param-value>
-    </context-param>
-
-    <!--
-        this filter performs startup configurations for first installation
-    -->
-    <filter>
-        <filter-name>KiWiPreStartupFilter</filter-name>
-        <filter-class>kiwi.core.servlet.KiWiPreStartupFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>KiWiPreStartupFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-
-
-    <!-- handle OPTIONS requests -->
-    <filter>
-      <filter-name>LMFOptionsFilter</filter-name>
-      <filter-class>kiwi.core.servlet.LMFOptionsFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>LMFOptionsFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-
-
-    <!-- Serve static resources from file system and from .jar files of the respective modules -->
-    <filter>
-        <filter-name>KiWiResourceFilter</filter-name>
-        <filter-class>kiwi.core.servlet.KiWiResourceFilter</filter-class>
-        <init-param>
-            <!-- cache resources loaded from module jar files? -->
-            <param-name>kiwi.resourceCaching</param-name>
-            <param-value>true</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <filter-name>KiWiResourceFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-
-
-    <!-- H2 Configuration -->
-    <filter>
-      <filter-name>KiWiH2ConsoleFilter</filter-name>
-      <filter-class>kiwi.core.servlet.KiWiH2ConsoleFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>KiWiH2ConsoleFilter</filter-name>
-        <url-pattern>/database/*</url-pattern>
-    </filter-mapping>
-	<servlet>
-		<servlet-name>H2Console</servlet-name>
-		<servlet-class>org.h2.server.web.WebServlet</servlet-class>
-		<init-param> <param-name>webAllowOthers</param-name> <param-value>true</param-value> </init-param>
-		<!--	<init-param> <param-name>trace</param-name> <param-value></param-value> </init-param> -->
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>H2Console</servlet-name>
-		<url-pattern>/database/*</url-pattern>
-	</servlet-mapping>
-	
-
-     <mime-mapping>
-       <extension>.xsl</extension>
-       <!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ -->
-       <mime-type>application/xslt+xml</mime-type>
-     </mime-mapping>
-
-
-    <servlet>
-        <servlet-name>ViewStatusMessages</servlet-name>
-        <servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>ViewStatusMessages</servlet-name>
-        <url-pattern>/logging/status</url-pattern>
-    </servlet-mapping>
-
-
-    <filter>
-        <filter-name>KiWi Webservices</filter-name>
-        <filter-class>
-            org.jboss.resteasy.plugins.server.servlet.FilterDispatcher
-        </filter-class>
-        <init-param>
-            <param-name>javax.ws.rs.Application</param-name>
-            <param-value>kiwi.core.webservices.CoreApplication</param-value>
-        </init-param>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>KiWi Webservices</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    
-    <context-param>
-        <param-name>resteasy.injector.factory</param-name>
-        <param-value>org.jboss.resteasy.cdi.CdiInjectorFactory</param-value>
-    </context-param>
-
-    <filter>
-        <filter-name>KiWiPostStartupFilter</filter-name>
-        <filter-class>
-            kiwi.core.servlet.KiWiPostStartupFilter
-        </filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>KiWiPostStartupFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-
-</web-app>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-webapp/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/launchers/lmf-webapp/src/main/webapp/index.jsp b/launchers/lmf-webapp/src/main/webapp/index.jsp
deleted file mode 100644
index 6038c3e..0000000
--- a/launchers/lmf-webapp/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%--
-
-    Copyright (C) 2013 Salzburg Research.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
---%>
-<%@ page import="kiwi.core.api.config.ConfigurationService" %>
-<%@ page import="kiwi.core.util.KiWiContext" %>
-<%--
-  ~ Copyright (c) 2012 Salzburg Research.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  --%>
-<%
-    ConfigurationService configurationService = KiWiContext.getInstance(ConfigurationService.class);
-    response.sendRedirect(configurationService.getBaseUri()+configurationService.getStringConfiguration("kiwi.pages.startup"));
-%>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-webapp/src/main/webapp/search/test_luke.html
----------------------------------------------------------------------
diff --git a/launchers/lmf-webapp/src/main/webapp/search/test_luke.html b/launchers/lmf-webapp/src/main/webapp/search/test_luke.html
deleted file mode 100644
index c25fe98..0000000
--- a/launchers/lmf-webapp/src/main/webapp/search/test_luke.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-
-    Copyright (C) 2013 Salzburg Research.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-    <script type="text/javascript" src="javascripts/jquery.min.js"></script>
-    <title></title>
-    <script type="text/javascript">
-          $(document).ready(function(){
-              $.getJSON("../solr/skos/admin/luke?show=schema&wt=json",function(data){
-                   var fields = [];
-                  for(var property in data.schema.fields) {
-                     fields.push(property);
-                  }
-                  console.log(fields);
-              })
-          })
-    </script>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-webapp/src/main/webapp/skosjs-extension/test.html
----------------------------------------------------------------------
diff --git a/launchers/lmf-webapp/src/main/webapp/skosjs-extension/test.html b/launchers/lmf-webapp/src/main/webapp/skosjs-extension/test.html
deleted file mode 100644
index 08796f7..0000000
--- a/launchers/lmf-webapp/src/main/webapp/skosjs-extension/test.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-
-    Copyright (C) 2013 Salzburg Research.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-    <title></title>
-    <script type="text/javascript">
-        var x = location.href.substring(0,location.href.indexOf("LMF/"));  alert(x);
-    </script>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4c3a7698/launchers/lmf-webapp/src/main/webapp/solr/admin/_info.jsp
----------------------------------------------------------------------
diff --git a/launchers/lmf-webapp/src/main/webapp/solr/admin/_info.jsp b/launchers/lmf-webapp/src/main/webapp/solr/admin/_info.jsp
deleted file mode 100644
index e97329c..0000000
--- a/launchers/lmf-webapp/src/main/webapp/solr/admin/_info.jsp
+++ /dev/null
@@ -1,118 +0,0 @@
-<%--
-  ~ Copyright (c) 2012 Salzburg Research.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  --%>
-
-<%@ page import="org.apache.lucene.LucenePackage,
-                 org.apache.solr.common.util.XML,
-                 org.apache.solr.core.SolrConfig,
-                 org.apache.solr.core.SolrCore"%>
-<%@ page import="org.apache.solr.schema.IndexSchema"%>
-<%@ page import="java.io.File"%>
-<%@ page import="java.io.StringWriter"%>
-<%@ page import="java.net.InetAddress"%>
-<%@ page import="java.net.UnknownHostException"%>
-
-<%!
-  // only try to figure out the hostname once in a static block so 
-  // we don't have a potentially slow DNS lookup on every admin request
-  static InetAddress addr = null;
-  static String hostname = "unknown";
-  static {
-    try {
-      addr = InetAddress.getLocalHost();
-      hostname = addr.getCanonicalHostName();
-    } catch (UnknownHostException e) {
-      //default to unknown
-    }
-  }
-%>
-
-<%
-  // 
-  SolrCore  core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore");
-  if (core == null) {
-    response.sendError( 404, "missing core name in path" );
-    return;
-  }
-    
-  SolrConfig solrConfig = core.getSolrConfig();
-  int port = request.getServerPort();
-  IndexSchema schema = core.getSchema();
-
-  // enabled/disabled is purely from the point of a load-balancer
-  // and has no effect on local server function.  If there is no healthcheck
-  // configured, don't put any status on the admin pages.
-  String enabledStatus = null;
-  String enabledFile = solrConfig.get("admin/healthcheck/text()",null);
-  boolean isEnabled = false;
-  if (enabledFile!=null) {
-    isEnabled = new File(enabledFile).exists();
-  }
-
-  String collectionName = schema!=null ? schema.getName():"unknown";
-
-  String defaultSearch = "";
-  { 
-    StringWriter tmp = new StringWriter();
-    XML.escapeCharData
-      (solrConfig.get("admin/defaultQuery/text()", ""), tmp);
-    defaultSearch = tmp.toString();
-  }
-
-  String solrImplVersion = "";
-  String solrSpecVersion = "";
-  String luceneImplVersion = "";
-  String luceneSpecVersion = "";
-
-  { 
-    Package p;
-    StringWriter tmp;
-
-    p = SolrCore.class.getPackage();
-
-    tmp = new StringWriter();
-    solrImplVersion = p.getImplementationVersion();
-    if (null != solrImplVersion) {
-      XML.escapeCharData(solrImplVersion, tmp);
-      solrImplVersion = tmp.toString();
-    }
-    tmp = new StringWriter();
-    solrSpecVersion = p.getSpecificationVersion() ;
-    if (null != solrSpecVersion) {
-      XML.escapeCharData(solrSpecVersion, tmp);
-      solrSpecVersion = tmp.toString();
-    }
-  
-    p = LucenePackage.class.getPackage();
-
-    tmp = new StringWriter();
-    luceneImplVersion = p.getImplementationVersion();
-    if (null != luceneImplVersion) {
-      XML.escapeCharData(luceneImplVersion, tmp);
-      luceneImplVersion = tmp.toString();
-    }
-    tmp = new StringWriter();
-    luceneSpecVersion = p.getSpecificationVersion() ;
-    if (null != luceneSpecVersion) {
-      XML.escapeCharData(luceneSpecVersion, tmp);
-      luceneSpecVersion = tmp.toString();
-    }
-  }
-  
-  String cwd=System.getProperty("user.dir");
-  String solrHome= solrConfig.getInstanceDir();
-  
-  boolean cachingEnabled = !solrConfig.getHttpCachingConfig().isNever304(); 
-%>


Mime
View raw message