Return-Path: 
 <commits-return-5906-apmail-archiva-commits-archive=archiva.apache.org@archiva.apache.org>
X-Original-To: apmail-archiva-commits-archive@www.apache.org
Delivered-To: apmail-archiva-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B7FB69E16
	for <apmail-archiva-commits-archive@www.apache.org>;
 Mon,  5 Mar 2012 15:52:00 +0000 (UTC)
Received: (qmail 81154 invoked by uid 500); 5 Mar 2012 15:52:00 -0000
Delivered-To: apmail-archiva-commits-archive@archiva.apache.org
Received: (qmail 81126 invoked by uid 500); 5 Mar 2012 15:52:00 -0000
Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@archiva.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@archiva.apache.org>
List-Post: <mailto:commits@archiva.apache.org>
List-Id: <commits.archiva.apache.org>
Reply-To: dev@archiva.apache.org
Delivered-To: mailing list commits@archiva.apache.org
Received: (qmail 81119 invoked by uid 99); 5 Mar 2012 15:52:00 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Mar 2012 15:52:00 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Mar 2012 15:51:59 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9E59B23889DA
	for <commits@archiva.apache.org>; Mon,  5 Mar 2012 15:51:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1297099 - in /archiva/trunk/archiva-modules/archiva-web:
 archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
 archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
Date: Mon, 05 Mar 2012 15:51:39 -0000
To: commits@archiva.apache.org
From: olamy@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120305155139.9E59B23889DA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: olamy
Date: Mon Mar  5 15:51:39 2012
New Revision: 1297099

URL: http://svn.apache.org/viewvc?rev=1297099&view=rev
Log:
add osgi search parameters

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1297099&r1=1297098&r2=1297099&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Mon Mar  5 15:51:39 2012
@@ -232,6 +232,10 @@ search.artifact.results.classifier=Class
 search.artifact.search.form.query.classifier=Classifier
 search.artifact.result.filter=Remove Filters
 search.artifact.result.grid.filter=Filter
+search.artifact.search.form.query.bundleSymbolicName=Symbolic Name
+search.artifact.search.form.query.bundleVersion=Bundle Version
+search.artifact.search.form.query.bundleExportPackage=Export Package
+search.artifact.search.form.query.bundleExportService=Export Service
 
 #login
 login.username.placehoder=Username

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1297099&r1=1297098&r2=1297099&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Mon Mar  5 15:51:39 2012
@@ -272,7 +272,41 @@
                 </form>
             </div>
             <div class="pill-pane" id="search-osgi-form-pane">
-              <p>osgi search form.</p>
+                <form class="well form-horizontal" id="search-osgi-form">
+                  <fieldset>
+                    <div class="control-group">
+                      <label class="control-label" for="groupId">${$.i18n.prop('search.artifact.search.form.query.bundleSymbolicName')}</label>
+                      <div class="controls">
+                        <input type="text" class="input-medium search-query" id="bundleSymbolicName" name="bundleSymbolicName" size="50"
+                               data-bind="value: searchRequest().bundleSymbolicName"/>
+                      </div>
+                    </div>
+                    <div class="control-group">
+                      <label class="control-label" for="groupId">${$.i18n.prop('search.artifact.search.form.query.bundleVersion')}</label>
+                      <div class="controls">
+                        <input type="text" class="input-medium search-query" id="bundleVersion" name="bundleVersion" size="50"
+                               data-bind="value: searchRequest().bundleVersion"/>
+                      </div>
+                    </div>
+                    <div class="control-group">
+                      <label class="control-label" for="groupId">${$.i18n.prop('search.artifact.search.form.query.bundleExportPackage')}</label>
+                      <div class="controls">
+                        <input type="text" class="input-medium search-query" id="bundleExportPackage" name="bundleExportPackage" size="50"
+                               data-bind="value: searchRequest().bundleExportPackage"/>
+                      </div>
+                    </div>
+                    <div class="control-group">
+                      <label class="control-label" for="groupId">${$.i18n.prop('search.artifact.search.form.query.bundleExportService')}</label>
+                      <div class="controls">
+                        <input type="text" class="input-medium search-query" id="bundleExportService" name="bundleExportService" size="50"
+                               data-bind="value: searchRequest().bundleExportService"/>
+                      </div>
+                    </div>
+                  </fieldset>
+                  <button type="submit" id="btn-osgi-search" class="btn btn-primary"
+                          data-bind="click: advancedSearch">${$.i18n.prop('search.artifact.search.form.btn.search')}</button>
+
+                </form>
             </div>
           </div>
         </div>