git results

gistfile1.txt

root@dotcms-colo2:/wwwroot/starter.dotcms.com# git pull
Updating c6a4c7e..76c3e23
Fast-forward
 .gitignore                                         |    3 +-
 .../examples/osgi/com.dotcms.actionlet/INSTALL.txt |   10 +
 .../osgi/com.dotcms.actionlet/META-INF/MANIFEST.MF |   11 +
 docs/examples/osgi/com.dotcms.actionlet/README.txt |   50 +
 .../osgi/com.dotcms.actionlet/deploy.jardesc       |   16 +
 .../com/dotmarketing/osgi/actionlet/Activator.java |   11 +
 .../dotmarketing/osgi/actionlet/MyActionlet.java   |   38 +
 .../examples/osgi/com.dotcms.view.tool/INSTALL.txt |   10 +
 .../osgi/com.dotcms.view.tool/META-INF/MANIFEST.MF |   11 +
 docs/examples/osgi/com.dotcms.view.tool/README.txt |   50 +
 .../osgi/com.dotcms.view.tool/deploy.jardesc       |   16 +
 .../com/dotmarketing/osgi/viewtools/Activator.java |   11 +
 .../dotmarketing/osgi/viewtools/MyToolInfo.java    |   24 +
 .../dotmarketing/osgi/viewtools/MyViewTool.java    |   19 +
 .../org.apache.felix.bundlerepository-1.6.6.jar    |  Bin 0 -> 168279 bytes
 .../bundle/org.apache.felix.fileinstall-3.1.10.jar |  Bin 0 -> 72642 bytes
 .../org.apache.felix.gogo.command-0.12.0.jar       |  Bin 0 -> 51746 bytes
 .../org.apache.felix.gogo.runtime-0.10.0.jar       |  Bin 0 -> 66965 bytes
 .../bundle/org.apache.felix.gogo.shell-0.10.0.jar  |  Bin 0 -> 49004 bytes
 .../felix/bundle/org.osgi.core-1.5.0-SNAPSHOT.jar  |  Bin 0 -> 99983 bytes
 dotCMS/WEB-INF/felix/felix-cache/.gitignore        |    2 +
 dotCMS/WEB-INF/lib/felix-4.0.2.jar                 |  Bin 0 -> 493190 bytes
 dotCMS/WEB-INF/web.xml                             |   65 +-
 src-conf/dotmarketing-config.properties            | 1437 ++++++++++----------
 .../dotmarketing/listeners/OsgiFelixListener.java  |  143 ++
 .../osgi/AbstractViewToolActivator.java            |  109 ++
 src/com/dotmarketing/osgi/HostActivator.java       |   41 +
 .../portlets/workflows/business/WorkflowAPI.java   |    2 +-
 .../workflows/business/WorkflowAPIImpl.java        |   85 +-
 .../workflows/business/WorkflowAPIOsgiService.java |   10 +
 .../workflows/model/WorkflowActionClass.java       |    8 +-
 .../tools/view/PrimitiveToolboxManager.java        |   42 +
 .../apache/velocity/tools/view/ToolboxManager.java |    7 +-
 .../velocity/tools/view/XMLToolboxManager.java     |   34 +-
 .../tools/view/servlet/ServletToolboxManager.java  |   24 +
 35 files changed, 1504 insertions(+), 785 deletions(-)
 create mode 100644 docs/examples/osgi/com.dotcms.actionlet/INSTALL.txt
 create mode 100644 docs/examples/osgi/com.dotcms.actionlet/META-INF/MANIFEST.MF
 create mode 100644 docs/examples/osgi/com.dotcms.actionlet/README.txt
 create mode 100644 docs/examples/osgi/com.dotcms.actionlet/deploy.jardesc
 create mode 100644 docs/examples/osgi/com.dotcms.actionlet/src/com/dotmarketing/osgi/actionlet/Activator.java
 create mode 100644 docs/examples/osgi/com.dotcms.actionlet/src/com/dotmarketing/osgi/actionlet/MyActionlet.java
 create mode 100644 docs/examples/osgi/com.dotcms.view.tool/INSTALL.txt
 create mode 100644 docs/examples/osgi/com.dotcms.view.tool/META-INF/MANIFEST.MF
 create mode 100644 docs/examples/osgi/com.dotcms.view.tool/README.txt
 create mode 100644 docs/examples/osgi/com.dotcms.view.tool/deploy.jardesc
 create mode 100644 docs/examples/osgi/com.dotcms.view.tool/src/com/dotmarketing/osgi/viewtools/Activator.java
 create mode 100644 docs/examples/osgi/com.dotcms.view.tool/src/com/dotmarketing/osgi/viewtools/MyToolInfo.java
 create mode 100644 docs/examples/osgi/com.dotcms.view.tool/src/com/dotmarketing/osgi/viewtools/MyViewTool.java
 create mode 100644 dotCMS/WEB-INF/felix/bundle/org.apache.felix.bundlerepository-1.6.6.jar
 create mode 100644 dotCMS/WEB-INF/felix/bundle/org.apache.felix.fileinstall-3.1.10.jar
 create mode 100644 dotCMS/WEB-INF/felix/bundle/org.apache.felix.gogo.command-0.12.0.jar
 create mode 100644 dotCMS/WEB-INF/felix/bundle/org.apache.felix.gogo.runtime-0.10.0.jar
 create mode 100644 dotCMS/WEB-INF/felix/bundle/org.apache.felix.gogo.shell-0.10.0.jar
 create mode 100644 dotCMS/WEB-INF/felix/bundle/org.osgi.core-1.5.0-SNAPSHOT.jar
 create mode 100644 dotCMS/WEB-INF/felix/felix-cache/.gitignore
 create mode 100644 dotCMS/WEB-INF/felix/load/.gitignore
 create mode 100644 dotCMS/WEB-INF/lib/felix-4.0.2.jar
 create mode 100644 src/com/dotmarketing/listeners/OsgiFelixListener.java
 create mode 100644 src/com/dotmarketing/osgi/AbstractViewToolActivator.java
 create mode 100644 src/com/dotmarketing/osgi/HostActivator.java
 create mode 100644 src/com/dotmarketing/portlets/workflows/business/WorkflowAPIOsgiService.java
 create mode 100644 src/org/apache/velocity/tools/view/PrimitiveToolboxManager.java